Skip to content

Commit

Permalink
Maintenance (#107)
Browse files Browse the repository at this point in the history
* update `ByteBuddy to 1.10.11`
* add `AbstractQueuedSynchronizer` to preinitialize and fix #106
* update `shadow`
* update `scalatest`
  • Loading branch information
dpsoft authored Jun 30, 2020
1 parent b28a29e commit e83b05d
Show file tree
Hide file tree
Showing 13 changed files with 51 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ cache:
matrix:
include:
- jdk: openjdk8
- jdk: openjdk9
- jdk: openjdk10
- jdk: openjdk11
- jdk: openjdk12
- jdk: openjdk13

script:
- ./travis-test.sh
Expand Down
14 changes: 9 additions & 5 deletions agent/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ plugins {
id 'java'
id 'scala'
id 'maven-publish'
id 'com.github.maiflai.scalatest' version '0.25'
id 'com.github.johnrengelman.shadow' version '5.0.0'
id 'com.github.maiflai.scalatest' version '0.26'
id 'com.github.johnrengelman.shadow' version '6.0.0'
}

configurations {
Expand All @@ -32,9 +32,9 @@ dependencies {
compile 'net.jodah:expiringmap:0.5.9'
compile 'org.tinylog:tinylog:1.3.6'
compile 'com.github.tobiasrm:tinylog-coloredconsole:1.3.1'
compile 'net.bytebuddy:byte-buddy-agent:1.10.2'
compile 'net.bytebuddy:byte-buddy-agent:1.10.11'

compile files('libs/byte-buddy-1.10.2.jar')
compile files('libs/byte-buddy-1.10.11.jar')

testCompile 'org.mockito:mockito-core:2.28.2'
testCompile 'org.scalatest:scalatest_2.12:3.0.1'
Expand Down Expand Up @@ -64,8 +64,12 @@ shadowJar {
}

exclude 'META-INF/services/javax.*'
exclude 'META-INF/licenses/**'
exclude 'META-INF/versions/**'
exclude 'META-INF/maven/**'
exclude 'META-INF/*.DSA'
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'
exclude 'META-INF/*.RSA'
exclude 'tinylog.properties'

Expand All @@ -82,7 +86,7 @@ shadowJar {
}

dependencies {
exclude('org.projectlombok:lombok:1.18.10')
exclude('org.projectlombok:lombok:1.18.12')
}

doLast {
Expand Down
Binary file added agent/libs/byte-buddy-1.10.11-sources.jar
Binary file not shown.
Binary file added agent/libs/byte-buddy-1.10.11.jar
Binary file not shown.
Binary file removed agent/libs/byte-buddy-1.10.2-sources.jar
Binary file not shown.
Binary file removed agent/libs/byte-buddy-1.10.2.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ private static List<String> getJavaUsedTypes() {
val types = new ArrayList<String>();
types.add("java.util.concurrent.locks.LockSupport");
types.add("java.util.concurrent.ThreadLocalRandom");
types.add("java.util.concurrent.locks.AbstractQueuedSynchronizer$Node");
return types;
}

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

buildscript {
ext.scala_version = '2.12.8'
ext.scala_version = '2.12.11'
ext.agent_version = project(":agent").version
ext.kamon_agent_dep = "io.kamon:kanela-agent:${agent_version}"

Expand Down Expand Up @@ -54,8 +54,8 @@ allprojects {

dependencies {
compile 'io.vavr:vavr:0.10.0'
compileOnly 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10'
compileOnly 'org.projectlombok:lombok:1.18.12'
annotationProcessor 'org.projectlombok:lombok:1.18.12'

agent(kamon_agent_dep)
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 1.0.5
version: 1.0.6
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
18 changes: 17 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
Expand All @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down

0 comments on commit e83b05d

Please sign in to comment.