chore(deps): upgrade dependencies/plugins 🛠️

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)
foldright · Apr 19, 2024 · dabd7bd · dabd7bd
1 parent 08dd521
commit dabd7bd
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 38 deletions.
diff --git 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
@@ -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/README.md b/README.md
@@ -17,8 +17,8 @@
 <a href="https://foldright.io/cffu/dokka/"><img src="https://img.shields.io/github/release/foldright/cffu?label=dokka&color=339933&logo=kotlin&logoColor=white" alt="dokka"></a>
 <a href="https://central.sonatype.com/artifact/io.foldright/cffu/0.9.0/versions"><img src="https://img.shields.io/maven-central/v/io.foldright/cffu?logo=apache-maven&logoColor=white" alt="Maven Central"></a>
 <a href="https://github.com/foldright/cffu/releases"><img src="https://img.shields.io/github/release/foldright/cffu.svg" alt="GitHub Releases"></a>
-<a href="https://github.com/foldright/cffu/stargazers"><img src="https://img.shields.io/github/stars/foldright/cffu" alt="GitHub Stars"></a>
-<a href="https://github.com/foldright/cffu/fork"><img src="https://img.shields.io/github/forks/foldright/cffu" alt="GitHub Forks"></a>
+<a href="https://github.com/foldright/cffu/stargazers"><img src="https://img.shields.io/github/stars/foldright/cffu?style=flat" alt="GitHub Stars"></a>
+<a href="https://github.com/foldright/cffu/fork"><img src="https://img.shields.io/github/forks/foldright/cffu?style=flat" alt="GitHub Forks"></a>
 <a href="https://github.com/foldright/cffu/issues"><img src="https://img.shields.io/github/issues/foldright/cffu" alt="GitHub Issues"></a>
 <a href="https://github.com/foldright/cffu/graphs/contributors"><img src="https://img.shields.io/github/contributors/foldright/cffu" alt="GitHub Contributors"></a>
 <a href="https://github.com/foldright/cffu"><img src="https://img.shields.io/github/repo-size/foldright/cffu" alt="GitHub repo size"></a>

diff --git a/cffu-bom/pom.xml b/cffu-bom/pom.xml
@@ -98,7 +98,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -108,7 +108,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.2.2</version>
+					<version>3.2.5</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -118,7 +118,7 @@
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.11</version>
+					<version>0.8.12</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -138,7 +138,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>3.2.3</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

diff --git a/cffu-kotlin/pom.xml b/cffu-kotlin/pom.xml
@@ -56,7 +56,7 @@
 
 	<properties>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
-		<dokka.version>1.9.10</dokka.version>
+		<dokka.version>1.9.20</dokka.version>
 	</properties>
 
 	<dependencies>

diff --git a/...-executor-wrapper/src/main/java/io/foldright/cffu/ttl/CffuTtlExecutorWrapperProvider.java b/...-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
@@ -14,15 +14,15 @@
 		<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
 		<maven.deploy.skip>true</maven.deploy.skip>
 
-		<kotlin.version>1.9.21</kotlin.version>
+		<kotlin.version>1.9.23</kotlin.version>
 		<kotlin.compiler.jvmTarget>${maven.compiler.source}</kotlin.compiler.jvmTarget>
 
 		<!-- overridden by submodule -->
 		<exec.main.class/>
 		<demo.module.name/>
 
 		<!-- testing dependencies versions -->
-		<junit5.version>5.10.1</junit5.version>
+		<junit5.version>5.10.2</junit5.version>
 	</properties>
 
 	<modules>
@@ -115,7 +115,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.11.0</version>
+					<version>3.13.0</version>
 					<configuration>
 						<!-- https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#compilerArgs -->
 						<compilerArgs>
@@ -127,17 +127,17 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.2.2</version>
+					<version>3.2.5</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.4.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -147,7 +147,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.3</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -167,7 +167,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
-					<version>3.1.1</version>
+					<version>3.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -177,7 +177,7 @@
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.11</version>
+					<version>0.8.12</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git 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
@@ -70,20 +70,20 @@
 		<maven.enforcer.pom.version.regex>^\d(\.\d+)?\.(\d+|x)-SNAPSHOT$</maven.enforcer.pom.version.regex>
 		<release.pom.version.regex>^\d\.\d+\.\d+(-(Alpha|Beta|RC)\d+)?$</release.pom.version.regex>
 
-		<spotbugs.annotations.version>4.8.2</spotbugs.annotations.version>
+		<spotbugs.annotations.version>4.8.4</spotbugs.annotations.version>
 		<jsr305.version>3.0.2</jsr305.version>
 		<jetbrains.annotations.version>24.1.0</jetbrains.annotations.version>
 
-		<kotlin.version>1.9.21</kotlin.version>
+		<kotlin.version>1.9.23</kotlin.version>
 		<kotlin.compiler.jvmTarget>${maven.compiler.source}</kotlin.compiler.jvmTarget>
 		<!-- https://kotlinlang.org/docs/maven.html#specifying-compiler-options -->
 		<kotlin.compiler.apiVersion>1.6</kotlin.compiler.apiVersion>
 
-		<slf4j.version>2.0.9</slf4j.version>
+		<slf4j.version>2.0.13</slf4j.version>
 
 		<!-- testing dependencies versions -->
-		<junit5.version>5.10.1</junit5.version>
-		<kotest.version>5.8.0</kotest.version>
+		<junit5.version>5.10.2</junit5.version>
+		<kotest.version>5.8.1</kotest.version>
 	</properties>
 
 	<dependencies>
@@ -185,7 +185,7 @@
 			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>transmittable-thread-local</artifactId>
-				<version>2.14.4</version>
+				<version>2.14.5</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
@@ -379,7 +379,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.11.0</version>
+					<version>3.13.0</version>
 					<configuration>
 						<!-- https://maven.apache.org/plugins/maven-compiler-plugin/compile-mojo.html#compilerArgs -->
 						<compilerArgs>
@@ -391,23 +391,23 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.2.2</version>
+					<version>3.2.5</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.4.0</version>
 				</plugin>
 				<plugin>
 					<!-- https://github.com/moditect/moditect -->
 					<groupId>org.moditect</groupId>
 					<artifactId>moditect-maven-plugin</artifactId>
-					<version>1.1.0</version>
+					<version>1.2.1.Final</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>3.5.1</version>
+					<version>3.5.2</version>
 					<configuration>
 						<shadeSourcesContent>true</shadeSourcesContent>
 						<dependencyReducedPomLocation>
@@ -418,7 +418,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.3.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -428,7 +428,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.2.3</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -453,17 +453,17 @@
 				<plugin>
 					<groupId>io.github.git-commit-id</groupId>
 					<artifactId>git-commit-id-maven-plugin</artifactId>
-					<version>7.0.0</version>
+					<version>8.0.2</version>
 				</plugin>
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.8.2.0</version>
+					<version>4.8.4.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.11</version>
+					<version>0.8.12</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,7 @@ readonly JDK_VERSIONS=(
		11
		17
		21
		22
		)

		for jdk_version in "${JDK_VERSIONS[@]}"; do
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,7 @@ readonly JDK_VERSIONS=(
		11
		17
		"$default_build_jdk_version"
		22
		)

		# here use `install` and `-D performRelease` intended
Expand Down