From f47919dde0886d7e4b32a0bba256e487eca18d2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:28:46 +0800 Subject: [PATCH] =?UTF-8?q?chore(deps):=20upgrade=20dependencies/plugins?= =?UTF-8?q?=20=F0=9F=9B=A0=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 (#100) bump com.github.spotbugs:spotbugs-annotations from 4.8.2 to 4.8.3 (#101) bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 (#102) bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.0 (#103) bump kotlin.version from 1.9.21 to 1.9.22 in /demos (#105) bump kotlin.version from 1.9.21 to 1.9.22 (#106) bump slf4j.version from 2.0.9 to 2.0.10 (#107) bump slf4j.version from 2.0.10 to 2.0.11 (#108) bump org.apache.maven.plugins:maven-surefire-plugin 3.2.3 to 3.2.5 (#109) bump org.apache.maven.plugins:maven-surefire-plugin 3.2.3 to 3.2.5 (#110) bump com.github.spotbugs:spotbugs-maven-plugin 4.8.2.0 to 4.8.3.0 (#111) bump codecov/codecov-action from 3 to 4 (#112) bump org.junit:junit-bom from 5.10.1 to 5.10.2 (#113) bump org.junit:junit-bom from 5.10.1 to 5.10.2 in /demos (#114) bump slf4j.version from 2.0.11 to 2.0.12 (#115) bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.3.0 to 4.8.3.1 (#116) bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2 (#117) bump org.codehaus.mojo:exec-maven-plugin in /demos from 3.1.1 to 3.2.0 (#118) bump org.jetbrains.dokka:dokka-maven-plugin from 1.9.10 to 1.9.20 (#119) bump io.github.git-commit-id:git-commit-id-maven-plugin from 7.0.0 to 8.0.0 (#120) bump kotlin.version from 1.9.22 to 1.9.23 in /demos (#121) bump kotlin.version from 1.9.22 to 1.9.23 (#122) bump kotest.version from 5.8.0 to 5.8.1 (#123) bump org.apache.maven.plugins:maven-gpg-plugin from 3.1.0 to 3.2.0 (#125) bump io.github.git-commit-id:git-commit-id-maven-plugin from 8.0.0 to 8.0.1 (#126) bump org.apache.maven.plugins:maven-gpg-plugin in /demos from 3.1.0 to 3.2.0 (#127) bump org.moditect:moditect-maven-plugin from 1.1.0 to 1.2.0.Final (#128) bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.0 to 3.2.1 (#129) bump org.apache.maven.plugins:maven-gpg-plugin in /demos from 3.2.0 to 3.2.1 (#130) bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0 (#131) bump io.github.git-commit-id:git-commit-id-maven-plugin from 8.0.1 to 8.0.2 (#132) bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0 (#133) bump org.apache.maven.plugins:maven-gpg-plugin in /demos from 3.2.1 to 3.2.2 (#134) bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.1 to 3.2.2 (#135) bump org.moditect:moditect-maven-plugin from 1.2.0.Final to 1.2.1.Final (#136) bump org.jacoco:jacoco-maven-plugin from 0.8.11 to 0.8.12 (#137) bump org.jacoco:jacoco-maven-plugin in /demos from 0.8.11 to 0.8.12 (#138) bump org.apache.maven.plugins:maven-source-plugin in /demos from 3.3.0 to 3.3.1 (#139) bump org.apache.maven.plugins:maven-source-plugin from 3.3.0 to 3.3.1 (#140) bump com.github.spotbugs:spotbugs-annotations from 4.8.3 to 4.8.4 (#141) bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.2 to 3.2.3 (#143) bump org.apache.maven.plugins:maven-gpg-plugin in /demos from 3.2.2 to 3.2.3 (#144) bump slf4j.version from 2.0.12 to 2.0.13 (#145) bump org.apache.maven.plugins:maven-jar-plugin from 3.3.0 to 3.4.0 (#146) bump org.apache.maven.plugins:maven-jar-plugin in /demos from 3.3.0 to 3.4.0 (#147) bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.3.1 to 4.8.4.0 (#142) --- .github/workflows/ci.yaml | 12 ++++--- .github/workflows/fast_ci.yaml | 2 +- cffu-bom/pom.xml | 8 ++--- cffu-kotlin/pom.xml | 2 +- .../ttl/CffuTtlExecutorWrapperProvider.java | 2 ++ demos/pom.xml | 18 +++++------ demos/scripts/integration_test | 1 + pom.xml | 32 +++++++++---------- scripts/integration_test | 1 + 9 files changed, 42 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dcc3039b..f6279504 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,21 +24,23 @@ jobs: 11 17 21 + 22 distribution: zulu # only first java setup need enable cache cache: maven - name: Run integration test - run: scripts/integration_test && demos/scripts/integration_test + run: scripts/integration_test + - name: Run integration of demos + run: demos/scripts/integration_test - name: Remove self maven install files run: rm -rf $HOME/.m2/repository/io/foldright/cffu* - name: Upload coverage reports to Codecov - uses: codecov/codecov-action@v3 - with: - name: codecov-umbrella - token: ${{ secrets.CODECOV_TOKEN }} + uses: codecov/codecov-action@v4 + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} # https://remarkablemark.org/blog/2017/10/12/check-git-dirty/ - name: Check git dirty diff --git a/.github/workflows/fast_ci.yaml b/.github/workflows/fast_ci.yaml index 6afea788..6ee48d24 100644 --- a/.github/workflows/fast_ci.yaml +++ b/.github/workflows/fast_ci.yaml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: 21 - distribution: zulu + distribution: microsoft # only first java setup need enable cache cache: maven - name: Build and test with Java 21 diff --git a/cffu-bom/pom.xml b/cffu-bom/pom.xml index 5a6ccf10..a6b0b738 100644 --- a/cffu-bom/pom.xml +++ b/cffu-bom/pom.xml @@ -98,7 +98,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins @@ -108,7 +108,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.5 org.apache.maven.plugins @@ -118,7 +118,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.3 sign-artifacts diff --git a/cffu-kotlin/pom.xml b/cffu-kotlin/pom.xml index b9566eaf..22d3a4a8 100644 --- a/cffu-kotlin/pom.xml +++ b/cffu-kotlin/pom.xml @@ -56,7 +56,7 @@ true - 1.9.10 + 1.9.20 diff --git a/cffu-ttl-executor-wrapper/src/main/java/io/foldright/cffu/ttl/CffuTtlExecutorWrapperProvider.java b/cffu-ttl-executor-wrapper/src/main/java/io/foldright/cffu/ttl/CffuTtlExecutorWrapperProvider.java index 23b05511..a2110e54 100644 --- a/cffu-ttl-executor-wrapper/src/main/java/io/foldright/cffu/ttl/CffuTtlExecutorWrapperProvider.java +++ b/cffu-ttl-executor-wrapper/src/main/java/io/foldright/cffu/ttl/CffuTtlExecutorWrapperProvider.java @@ -2,6 +2,7 @@ import com.alibaba.ttl.threadpool.TtlExecutors; import edu.umd.cs.findbugs.annotations.NonNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.foldright.cffu.spi.ExecutorWrapperProvider; import java.util.concurrent.Executor; @@ -20,6 +21,7 @@ public class CffuTtlExecutorWrapperProvider implements ExecutorWrapperProvider { */ @NonNull @Override + @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE") public Executor wrap(@NonNull Executor executor) { return TtlExecutors.getTtlExecutor(requireNonNull(executor, "executor is null")); } diff --git a/demos/pom.xml b/demos/pom.xml index 0ff8f73b..aa75a754 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -14,7 +14,7 @@ ${project.build.sourceEncoding} true - 1.9.21 + 1.9.23 ${maven.compiler.source} @@ -22,7 +22,7 @@ - 5.10.1 + 5.10.2 @@ -115,7 +115,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 @@ -127,17 +127,17 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.5 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.3 org.apache.maven.plugins @@ -167,7 +167,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.1 + 3.2.0 org.apache.maven.plugins @@ -177,7 +177,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 diff --git a/demos/scripts/integration_test b/demos/scripts/integration_test index 869d755e..c9ff610f 100755 --- a/demos/scripts/integration_test +++ b/demos/scripts/integration_test @@ -13,6 +13,7 @@ readonly JDK_VERSIONS=( 11 17 21 + 22 ) for jdk_version in "${JDK_VERSIONS[@]}"; do diff --git a/pom.xml b/pom.xml index 43cf8d20..ea9960d2 100644 --- a/pom.xml +++ b/pom.xml @@ -70,20 +70,20 @@ ^\d(\.\d+)?\.(\d+|x)-SNAPSHOT$ ^\d\.\d+\.\d+(-(Alpha|Beta|RC)\d+)?$ - 4.8.2 + 4.8.4 3.0.2 24.1.0 - 1.9.21 + 1.9.23 ${maven.compiler.source} 1.6 - 2.0.9 + 2.0.13 - 5.10.1 - 5.8.0 + 5.10.2 + 5.8.1 @@ -185,7 +185,7 @@ com.alibaba transmittable-thread-local - 2.14.4 + 2.14.5 org.apache.commons @@ -379,7 +379,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.13.0 @@ -391,23 +391,23 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.5 org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 org.moditect moditect-maven-plugin - 1.1.0 + 1.2.1.Final org.apache.maven.plugins maven-shade-plugin - 3.5.1 + 3.5.2 true @@ -418,7 +418,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 org.apache.maven.plugins @@ -428,7 +428,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.3 org.apache.maven.plugins @@ -453,17 +453,17 @@ io.github.git-commit-id git-commit-id-maven-plugin - 7.0.0 + 8.0.2 com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + 4.8.4.0 org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 diff --git a/scripts/integration_test b/scripts/integration_test index 912ac546..e0b15d73 100755 --- a/scripts/integration_test +++ b/scripts/integration_test @@ -20,6 +20,7 @@ readonly JDK_VERSIONS=( 11 17 "$default_build_jdk_version" + 22 ) # here use `install` and `-D performRelease` intended