From 304cbdf88b99b63197ac61bd8ac2171342e0d3f9 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 23 Mar 2026 22:56:40 -0400 Subject: [PATCH] Updates all dependencies and changes build from 11/21 to 11/25 Signed-off-by: Adrian Cole --- .github/workflows/create_release.yml | 8 +- .github/workflows/deploy.yml | 8 +- .github/workflows/lint.yml | 4 +- .github/workflows/security.yml | 8 +- .github/workflows/test.yml | 10 +- .mvn/wrapper/maven-wrapper.jar | Bin 63028 -> 63093 bytes .mvn/wrapper/maven-wrapper.properties | 22 +---- activemq-client/pom.xml | 4 +- .../reporter/activemq/ActiveMQContainer.java | 2 +- amqp-client/pom.xml | 4 +- amqp-client/src/it/amqp_v4/pom.xml | 2 +- .../reporter/amqp/RabbitMQContainer.java | 2 +- benchmarks/pom.xml | 4 +- .../reporter/KafkaSenderBenchmarks.java | 2 +- .../reporter/PulsarSenderBenchmarks.java | 2 +- build-bin/configure_lint | 2 +- kafka/pom.xml | 4 +- .../reporter/kafka/KafkaContainer.java | 2 +- libthrift/pom.xml | 4 +- .../reporter/libthrift/ZipkinContainer.java | 2 +- metrics-micrometer/pom.xml | 2 +- mvnw | 30 +++--- mvnw.cmd | 6 +- pom.xml | 93 +++++++++--------- pulsar-client/pom.xml | 5 +- .../reporter/pulsar/PulsarContainer.java | 2 +- 26 files changed, 115 insertions(+), 119 deletions(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index a7958d8f..972f6f18 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -10,21 +10,21 @@ on: # yamllint disable-line rule:truthy jobs: create_release: - runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish + runs-on: ubuntu-24.04 # newest available distribution, aka noble steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: # Prevent use of implicit GitHub Actions read-only GITHUB_TOKEN # because maven-release-plugin pushes commits to master. token: ${{ secrets.GH_TOKEN }} - name: Setup java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' # zulu as it supports a wide version range java-version: '11' # last that can compile the 1.6 release profile - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-jdk-11-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 41704b49..8c0656b5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ on: # yamllint disable-line rule:truthy jobs: deploy: name: deploy (${{ matrix.name }}) - runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish + runs-on: ubuntu-24.04 # newest available distribution, aka noble strategy: fail-fast: false # don't fail fast as we can re-run one job that failed matrix: @@ -29,14 +29,14 @@ jobs: deploy_script: build-bin/deploy_bom steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' # zulu as it supports a wide version range java-version: '11' # last that can compile the 1.6 release profile - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-jdk-11-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fe58404d..fcb7330f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,12 +24,12 @@ on: # yamllint disable-line rule:truthy jobs: lint: name: lint - runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish + runs-on: ubuntu-24.04 # newest available distribution, aka noble # skip commits made by the release plugin if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Lint run: | build-bin/configure_lint diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index a7847fc8..d94ea653 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -23,20 +23,20 @@ on: # yamllint disable-line rule:truthy jobs: security: name: security - runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish + runs-on: ubuntu-24.04 # newest available distribution, aka noble # skip commits made by the release plugin if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" steps: - name: Checkout Repository - uses: actions/checkout@v4 - - uses: actions/cache@v4 + uses: actions/checkout@v6 + - uses: actions/cache@v5 name: Cache Trivy Database with: path: .trivy key: ${{ runner.os }}-trivy restore-keys: ${{ runner.os }}-trivy - name: Run Trivy vulnerability and secret scanner - uses: aquasecurity/trivy-action@master + uses: aquasecurity/trivy-action@v0.35.0 id: trivy with: scan-type: 'fs' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a9c1ff9e..5a9ff7b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ on: # yamllint disable-line rule:truthy jobs: test: name: test (JDK ${{ matrix.java_version }}) - runs-on: ubuntu-22.04 # newest available distribution, aka jellyfish + runs-on: ubuntu-24.04 # newest available distribution, aka noble # skip commits made by the release plugin if: "!contains(github.event.head_commit.message, 'maven-release-plugin')" strategy: @@ -32,17 +32,17 @@ jobs: include: - java_version: '11' # last that can compile the 1.6 release profile maven_args: -Prelease -Dgpg.skip - - java_version: '21' # Most recent LTS + - java_version: '25' # Most recent LTS steps: - name: Checkout Repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Setup java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' # zulu as it supports a wide version range java-version: ${{ matrix.java_version }} - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository # yamllint disable-line rule:line-length diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar index 7967f30dd1d25fe1b79a4a6e50e2aaa0e425c02c..eebc3c18b4e0bce4a2a9e66be24c4a410f17a1fa 100644 GIT binary patch delta 5797 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 delta 5783 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 Y0nj}fSlKkVQAz{)dkB23nN#xr0ccu%S^xk5 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 9548abd8..203e1088 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,20 +1,4 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=bin -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index 487a184a..93d6fee7 100644 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -24,7 +24,7 @@ - 5.18.7 + 5.19.2 @@ -50,7 +50,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQContainer.java b/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQContainer.java index eeb808de..da2e729f 100644 --- a/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQContainer.java +++ b/activemq-client/src/test/java/zipkin2/reporter/activemq/ActiveMQContainer.java @@ -19,7 +19,7 @@ final class ActiveMQContainer extends GenericContainer { static final int ACTIVEMQ_PORT = 61616; ActiveMQContainer() { - super(parse("ghcr.io/openzipkin/zipkin-activemq:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin-activemq:3.6.0")); withExposedPorts(ACTIVEMQ_PORT); waitStrategy = Wait.forListeningPorts(ACTIVEMQ_PORT); withStartupTimeout(Duration.ofSeconds(60)); diff --git a/amqp-client/pom.xml b/amqp-client/pom.xml index 53dd8274..2eec5c99 100644 --- a/amqp-client/pom.xml +++ b/amqp-client/pom.xml @@ -22,7 +22,7 @@ zipkin2.reporter.amqp ${project.basedir}/.. - 5.25.0 + 5.29.0 4.12.0 @@ -50,7 +50,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/amqp-client/src/it/amqp_v4/pom.xml b/amqp-client/src/it/amqp_v4/pom.xml index acf42ac2..989449df 100644 --- a/amqp-client/src/it/amqp_v4/pom.xml +++ b/amqp-client/src/it/amqp_v4/pom.xml @@ -63,7 +63,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter @testcontainers.version@ diff --git a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQContainer.java b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQContainer.java index bd9f91fd..1077cd7f 100644 --- a/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQContainer.java +++ b/amqp-client/src/test/java/zipkin2/reporter/amqp/RabbitMQContainer.java @@ -20,7 +20,7 @@ final class RabbitMQContainer extends GenericContainer { static final int RABBIT_PORT = 5672; RabbitMQContainer() { - super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.6.0")); withExposedPorts(RABBIT_PORT); waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1); withStartupTimeout(Duration.ofSeconds(60)); diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 4e9bafce..517d9fd7 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -99,13 +99,13 @@ com.linecorp.armeria armeria - 1.31.3 + 1.37.0 test org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/benchmarks/src/test/java/zipkin2/reporter/KafkaSenderBenchmarks.java b/benchmarks/src/test/java/zipkin2/reporter/KafkaSenderBenchmarks.java index 5d638cdb..08d31ea8 100644 --- a/benchmarks/src/test/java/zipkin2/reporter/KafkaSenderBenchmarks.java +++ b/benchmarks/src/test/java/zipkin2/reporter/KafkaSenderBenchmarks.java @@ -33,7 +33,7 @@ public class KafkaSenderBenchmarks extends SenderBenchmarks { static final class KafkaContainer extends GenericContainer { KafkaContainer() { - super(parse("ghcr.io/openzipkin/zipkin-kafka:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin-kafka:3.6.0")); waitStrategy = Wait.forHealthcheck(); // Kafka broker listener port (19092) needs to be exposed for test cases to access it. addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP); diff --git a/benchmarks/src/test/java/zipkin2/reporter/PulsarSenderBenchmarks.java b/benchmarks/src/test/java/zipkin2/reporter/PulsarSenderBenchmarks.java index d76f8f2c..29ea8147 100644 --- a/benchmarks/src/test/java/zipkin2/reporter/PulsarSenderBenchmarks.java +++ b/benchmarks/src/test/java/zipkin2/reporter/PulsarSenderBenchmarks.java @@ -34,7 +34,7 @@ static final class PulsarContainer extends GenericContainer { static final int BROKER_HTTP_PORT = 8080; PulsarContainer() { - super(parse("ghcr.io/openzipkin/zipkin-pulsar:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin-pulsar:3.6.0")); withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT); String cmd = "/pulsar/bin/apply-config-from-env.py /pulsar/conf/standalone.conf " + "&& bin/pulsar standalone " + diff --git a/build-bin/configure_lint b/build-bin/configure_lint index 9273e529..a6ce8d11 100755 --- a/build-bin/configure_lint +++ b/build-bin/configure_lint @@ -5,4 +5,4 @@ markdown-link-check -V || npm install -g markdown-link-check@3.12.2 # Attempt to install yamllint if absent -yamllint || pip install --user yamllint +yamllint -v || pip install --user yamllint diff --git a/kafka/pom.xml b/kafka/pom.xml index 20592e79..90bb1903 100644 --- a/kafka/pom.xml +++ b/kafka/pom.xml @@ -43,12 +43,12 @@ org.apache.kafka kafka-clients - 3.9.1 + 3.9.2 org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/kafka/src/test/java/zipkin2/reporter/kafka/KafkaContainer.java b/kafka/src/test/java/zipkin2/reporter/kafka/KafkaContainer.java index 5612325f..aeda43ff 100644 --- a/kafka/src/test/java/zipkin2/reporter/kafka/KafkaContainer.java +++ b/kafka/src/test/java/zipkin2/reporter/kafka/KafkaContainer.java @@ -28,7 +28,7 @@ final class KafkaContainer extends GenericContainer { static final int KAFKA_PORT = 19092; KafkaContainer() { - super(parse("ghcr.io/openzipkin/zipkin-kafka:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin-kafka:3.6.0")); waitStrategy = Wait.forHealthcheck(); // Kafka broker listener port (19092) needs to be exposed for test cases to access it. addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP); diff --git a/libthrift/pom.xml b/libthrift/pom.xml index e9e78b68..2bcd85ae 100644 --- a/libthrift/pom.xml +++ b/libthrift/pom.xml @@ -47,12 +47,12 @@ common in libthrift and lead to rev-lock. As scribe is a deprecated transport in Zipkin, it is ok to update this to a signature breaking version on minor, but increment to the next minor in the PR. --> - 0.21.0 + 0.22.0 org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinContainer.java b/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinContainer.java index ff25ed29..12c21924 100644 --- a/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinContainer.java +++ b/libthrift/src/test/java/zipkin2/reporter/libthrift/ZipkinContainer.java @@ -22,7 +22,7 @@ final class ZipkinContainer extends GenericContainer { static final int HTTP_PORT = 9411; ZipkinContainer() { - super(parse("ghcr.io/openzipkin/zipkin:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin:3.6.0")); // zipkin-server disables scribe by default. withEnv("COLLECTOR_SCRIBE_ENABLED", "true"); withExposedPorts(SCRIBE_PORT, HTTP_PORT); diff --git a/metrics-micrometer/pom.xml b/metrics-micrometer/pom.xml index 2c1e8f95..6442a466 100644 --- a/metrics-micrometer/pom.xml +++ b/metrics-micrometer/pom.xml @@ -22,7 +22,7 @@ zipkin2.reporter.metrics.micrometer ${project.basedir}/.. - 1.14.7 + 1.16.4 diff --git a/mvnw b/mvnw index 5e9618ca..1ddd97b9 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Required ENV vars: # ------------------ @@ -201,6 +201,14 @@ MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} export MAVEN_PROJECTBASEDIR log "$MAVEN_PROJECTBASEDIR" +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + ########################################################################################## # Extension to allow automatically downloading the maven-wrapper.jar from Maven-central # This allows using the maven wrapper in projects that prohibit checking in binary data. @@ -212,15 +220,13 @@ else log "Couldn't find $wrapperJarPath, downloading it ..." if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar" else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar" fi while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') case "$key" in wrapperUrl) - wrapperUrl="$safeValue" + wrapperUrl=$(trim "${value-}") break ;; esac @@ -235,17 +241,17 @@ else log "Found wget ... using wget" [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget ${QUIET:+"$QUIET"} "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + wget ${QUIET:+"$QUIET"} --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" fi elif command -v curl >/dev/null; then log "Found curl ... using curl" [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl ${QUIET:+"$QUIET"} -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + curl ${QUIET:+"$QUIET"} --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" fi else log "Falling back to using Java to download" @@ -276,7 +282,7 @@ fi wrapperSha256Sum="" while IFS="=" read -r key value; do case "$key" in wrapperSha256Sum) - wrapperSha256Sum=$value + wrapperSha256Sum=$(trim "${value-}") break ;; esac @@ -284,7 +290,7 @@ done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" if [ -n "$wrapperSha256Sum" ]; then wrapperSha256Result=false if command -v sha256sum >/dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c - >/dev/null 2>&1; then wrapperSha256Result=true fi elif command -v shasum >/dev/null; then diff --git a/mvnw.cmd b/mvnw.cmd index 1204076a..c453424c 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -18,7 +18,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @@ -119,7 +119,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar" FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B @@ -133,7 +133,7 @@ if exist %WRAPPER_JAR% ( ) ) else ( if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar" + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar" ) if "%MVNW_VERBOSE%" == "true" ( echo Couldn't find %WRAPPER_JAR%, downloading it ... diff --git a/pom.xml b/pom.xml index 28585229..62458dcb 100755 --- a/pom.xml +++ b/pom.xml @@ -50,45 +50,45 @@ - 2.38.0 + 2.48.0 2.27.1 - 6.1.0 + 6.3.0 - 2.24.3 + 2.25.3 4.12.0 - 5.12.2 - 5.18.0 - 3.27.3 + 5.14.3 + 5.23.0 + 3.27.7 4.3.0 - 1.21.1 + 2.0.4 ${skipTests} 1.2.8 5.0.0 - 3.7.1 + 3.8.0 5.1.9 - 3.14.0 + 3.15.0 - 3.8.1 + 3.10.0 3.1.4 - 3.5.0 + 3.6.2 3.5.1 3.1.4 - 3.9.0 - 3.11.2 - 3.4.2 - 3.1.1 - 3.3.1 - 3.5.3 + 3.9.1 + 3.12.0 + 3.5.0 + 3.3.1 + 3.4.0 + 3.5.5 0.10.0 @@ -412,7 +412,7 @@ - [11,12),[17,18),[21,22) + [11,12),[25,26) @@ -426,8 +426,6 @@ ${license-maven-plugin.version} ${license.skip} - -
${main.basedir}/src/etc/header.txt
SLASHSTAR_STYLE @@ -445,25 +443,31 @@ SCRIPT_STYLE SCRIPT_STYLE - - **/log4j2.properties - .editorconfig - .gitattributes - .gitignore - .mailmap - .mvn/** - mvnw* - etc/header.txt - **/.idea/** - **/.editorconfig - LICENSE - NOTICE - **/*.md - **/*.bnd - src/test/resources/** - .github/** - build-bin/* - + + + +
${main.basedir}/src/etc/header.txt
+ + **/log4j2.properties + .editorconfig + .gitattributes + .gitignore + .mailmap + .mvn/** + mvnw* + etc/header.txt + **/.idea/** + **/.editorconfig + LICENSE + NOTICE + **/*.md + **/*.bnd + src/test/resources/** + .github/** + build-bin/* + + + true @@ -513,10 +517,10 @@ - error-prone-17+ + error-prone-21+ - - [17,18),[21,22) + + [21,) @@ -537,11 +541,12 @@ compile - true + true -XDcompilePolicy=simple --should-stop=ifError=FLOW -Xplugin:ErrorProne ${errorprone.args} + -XDaddTypeAnnotationsToSymbol=true -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED -J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED @@ -585,7 +590,7 @@ maven-gpg-plugin - 3.1.0 + 3.2.8 sign-artifacts diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index eff0c8f0..2e674c91 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -22,7 +22,8 @@ zipkin2.reporter.pulsar ${project.basedir}/.. - 4.0.5 + + 4.0.9 @@ -46,7 +47,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter ${testcontainers.version} test diff --git a/pulsar-client/src/test/java/zipkin2/reporter/pulsar/PulsarContainer.java b/pulsar-client/src/test/java/zipkin2/reporter/pulsar/PulsarContainer.java index bb8f986e..093434d4 100644 --- a/pulsar-client/src/test/java/zipkin2/reporter/pulsar/PulsarContainer.java +++ b/pulsar-client/src/test/java/zipkin2/reporter/pulsar/PulsarContainer.java @@ -20,7 +20,7 @@ final class PulsarContainer extends GenericContainer { static final int BROKER_HTTP_PORT = 8080; PulsarContainer() { - super(parse("ghcr.io/openzipkin/zipkin-pulsar:3.4.3")); + super(parse("ghcr.io/openzipkin/zipkin-pulsar:3.6.0")); withExposedPorts(BROKER_PORT, BROKER_HTTP_PORT); String cmd = "/pulsar/bin/apply-config-from-env.py /pulsar/conf/standalone.conf " + "&& bin/pulsar standalone " +