diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75563c7a..c3da887f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: run: | # Conditionally run different commands based on the Java version if [[ "${{ matrix.java }}" == "8" ]]; then - ./gradlew wrapper --gradle-version=8.4-rc-1 :agent:spec && ./gradlew wrapper --gradle-version=8.4-rc-1 agent:publishToMavenLocal + ./gradlew wrapper --gradle-version=8.10 :agent:spec && ./gradlew wrapper --gradle-version=8.10 agent:publishToMavenLocal else ./travis-test.sh fi \ No newline at end of file diff --git a/agent/build.gradle b/agent/build.gradle index d82970b6..a5c33410 100644 --- a/agent/build.gradle +++ b/agent/build.gradle @@ -33,9 +33,9 @@ dependencies { implementation 'org.tinylog:tinylog:1.3.6' implementation 'com.github.tobiasrm:tinylog-coloredconsole:1.3.1' - implementation 'net.bytebuddy:byte-buddy-agent:1.14.5' + implementation 'net.bytebuddy:byte-buddy-agent:1.15.1' - implementation files('libs/byte-buddy-1.14.5.jar') + implementation files('libs/byte-buddy-1.15.1.jar') testImplementation 'org.mockito:mockito-core:2.28.2' testImplementation 'org.scalatest:scalatest_2.12:3.1.4' @@ -216,4 +216,4 @@ task spec(dependsOn: ['testClasses'], type: JavaExec) { classpath = sourceSets.test.runtimeClasspath } -test.reports.html.required = false \ No newline at end of file +test.reports.html.required = false diff --git a/agent/libs/byte-buddy-1.14.5-sources.jar b/agent/libs/byte-buddy-1.15.1-sources.jar similarity index 57% rename from agent/libs/byte-buddy-1.14.5-sources.jar rename to agent/libs/byte-buddy-1.15.1-sources.jar index 9638a01f..bf8b6b3f 100644 Binary files a/agent/libs/byte-buddy-1.14.5-sources.jar and b/agent/libs/byte-buddy-1.15.1-sources.jar differ diff --git a/agent/libs/byte-buddy-1.14.5.jar b/agent/libs/byte-buddy-1.15.1.jar similarity index 59% rename from agent/libs/byte-buddy-1.14.5.jar rename to agent/libs/byte-buddy-1.15.1.jar index 1ae44be0..f19df702 100644 Binary files a/agent/libs/byte-buddy-1.14.5.jar and b/agent/libs/byte-buddy-1.15.1.jar differ diff --git a/build.gradle b/build.gradle index 7ef58da9..2be9f8cd 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,8 @@ allprojects { dependencies { implementation 'io.vavr:vavr:0.10.4' - compileOnly 'org.projectlombok:lombok:1.18.30' - annotationProcessor 'org.projectlombok:lombok:1.18.30' + compileOnly 'org.projectlombok:lombok:1.18.34' + annotationProcessor 'org.projectlombok:lombok:1.18.34' agent(kamon_agent_dep) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..7f93135c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e3b77bf6..9355b415 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/travis-test.sh b/travis-test.sh index b0f35ede..e0d546c5 100755 --- a/travis-test.sh +++ b/travis-test.sh @@ -36,7 +36,7 @@ main() { ) echo "[info] $(date) - starting gradle test" - (set -o pipefail && runTests |& filterOutput) + (set -o pipefail && runTests 2>&1 | filterOutput) } main $@