diff --git a/.editorconfig b/.editorconfig index ea3e22160..1e1d0bf1b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,22 +4,28 @@ root = true charset = utf-8 end_of_line = lf insert_final_newline = true -tab_width = 4 -indent_size = 4 -ij_continuation_indent_size = 8 + +tab_width = 2 +indent_size = 2 +ij_continuation_indent_size = 4 indent_style = space trim_trailing_whitespace = true -[*.xml] -indent_style = tab +ij_any_blank_lines_after_imports = 2 +ij_markdown_wrap_text_if_long = false -[*.{yml,yaml}] -indent_size = 2 -ij_continuation_indent_size = 4 [*.{java,kt}] -ij_java_wrap_long_lines = false +indent_size = 4 +ij_continuation_indent_size = 8 + [*.{md,mkd,markdown}] +indent_size = 4 +ij_continuation_indent_size = 8 trim_trailing_whitespace = false -ij_markdown_wrap_text_if_long = false + + +[*.xml] +indent_style = tab + diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 75c2c6d80..d1e432454 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest ] - java: [ 8, 11, 17, 21 ] + java: [ 8, 11, 17, 21, 22 ] fail-fast: false max-parallel: 64 name: Fast CI on Java ${{ matrix.java }} OS ${{ matrix.os }} diff --git a/.github/workflows/strong_ci.yaml b/.github/workflows/strong_ci.yaml index f01ddf6db..75f90dc29 100644 --- a/.github/workflows/strong_ci.yaml +++ b/.github/workflows/strong_ci.yaml @@ -24,6 +24,7 @@ jobs: 11 17 21 + 22 distribution: zulu cache: maven @@ -34,10 +35,9 @@ jobs: run: rm -rf $HOME/.m2/repository/com/alibaba/{transmittable-thread-local,ttl}* - 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/pom.xml b/pom.xml index e1b0de78d..34bd3b82b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.alibaba.ttl3 @@ -28,8 +28,8 @@ https://github.com/alibaba/transmittable-thread-local - https://github.com/alibaba/transmittable-thread-local/issues GitHub Issues + https://github.com/alibaba/transmittable-thread-local/issues GitHub Actions @@ -79,22 +79,22 @@ https://alibaba.github.io/transmittable-thread-local/apidocs/${project.version} - 4.8.1 + 4.8.6 3.0.2 24.1.0 - 1.9.21 + 1.9.25 ${maven.compiler.source} - 1.7.3 + 1.8.1 - 1.9.10 + 1.9.20 8 2.0.7 - 5.10.1 - 5.8.0 + 5.10.3 + 5.9.1 net.bytebuddy byte-buddy-parent - 1.14.10 + 1.14.18 pom import @@ -255,7 +255,7 @@ org.javassist javassist - 3.29.2-GA + 3.30.2-GA true @@ -402,9 +402,6 @@ - maven-enforcer-plugin @@ -415,6 +412,7 @@ + 3.3.9 @@ -428,7 +426,7 @@ maven-clean-plugin - 3.3.2 + 3.4.0 maven-resources-plugin @@ -441,19 +439,19 @@ maven-compiler-plugin - 3.11.0 + 3.13.0 maven-surefire-plugin - 3.2.2 + 3.3.1 maven-jar-plugin - 3.3.0 + 3.4.2 maven-shade-plugin - 3.5.1 + 3.6.0 true @@ -463,11 +461,11 @@ maven-source-plugin - 3.3.0 + 3.3.1 maven-javadoc-plugin - 3.6.2 + 3.8.0 org.jetbrains.dokka @@ -488,7 +486,7 @@ maven-gpg-plugin - 3.1.0 + 3.2.5 maven-site-plugin @@ -496,30 +494,30 @@ maven-install-plugin - 3.1.1 + 3.1.2 maven-deploy-plugin - 3.1.1 + 3.1.2 maven-enforcer-plugin - 3.4.1 + 3.5.0 io.github.git-commit-id git-commit-id-maven-plugin - 7.0.0 + 9.0.1 com.github.spotbugs spotbugs-maven-plugin - 4.8.1.0 + 4.8.3.1 org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 org.codehaus.mojo exec-maven-plugin - 3.1.1 + 3.4.1 ${java.home}/bin/java test @@ -550,23 +548,12 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 - - - - org.codehaus.mojo - versions-maven-plugin - 2.16.2 - - file://${maven.multiModuleProjectDirectory}/src/versions-rules.xml - false - + 1.7.0 + gen-src @@ -607,10 +594,10 @@ About package-list vs.element-list - Can't link to JDK10 in Javadoc comments - https://stackoverflow.com/a/49498219/922688 + https://stackoverflow.com/a/49498219/922688 - Missing javadoc/package-list for release 5.1 - https://github.com/gradle/gradle/issues/8183 - https://github.com/gradle/gradle/commit/5e88351dd456a5252d21f3a7ad25bff1b62a2fd2 + https://github.com/gradle/gradle/issues/8183 + https://github.com/gradle/gradle/commit/5e88351dd456a5252d21f3a7ad25bff1b62a2fd2 Using the linkoffline Option @@ -625,7 +612,6 @@ maven-javadoc-plugin @@ -873,7 +859,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.7.0 + 1.8.0 diff --git a/scripts/integration-test.sh b/scripts/integration-test.sh index 22a560531..f7250e04f 100755 --- a/scripts/integration-test.sh +++ b/scripts/integration-test.sh @@ -20,6 +20,7 @@ readonly JDK_VERSIONS=( 11 "$default_build_jdk_version" 21 + 22 ) # here use `install` and `-D performRelease` intended diff --git a/src/versions-rules.xml b/src/versions-rules.xml deleted file mode 100644 index b28039372..000000000 --- a/src/versions-rules.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - .*-[Aa]lpha([-.]?\d+)? - - .*-[Bb]eta([-.]?\d+)? - (?i).*-eap-\d+ - - .*-M\d+(-.*)? - - (?i).*-rc(-?\d+(-.*)?)? - - (?i).*-dev-?\d+(-.*)? - .*(-does)?-not-exist - - - - - - .*-native-.* - - - - diff --git a/ttl-bom/pom.xml b/ttl-bom/pom.xml index d3bccfd2f..035794341 100644 --- a/ttl-bom/pom.xml +++ b/ttl-bom/pom.xml @@ -96,20 +96,20 @@ maven-source-plugin - 3.3.0 + 3.3.1 maven-javadoc-plugin - 3.6.2 + 3.8.0 maven-deploy-plugin - 3.1.1 + 3.1.2 org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 @@ -128,7 +128,7 @@ maven-gpg-plugin - 3.1.0 + 3.2.5 sign-artifacts @@ -155,7 +155,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh diff --git a/ttl-core/src/main/java/com/alibaba/ttl3/internal/util/ConcurrentReferenceHashMap.java b/ttl-core/src/main/java/com/alibaba/ttl3/internal/util/ConcurrentReferenceHashMap.java index 184a3798a..f0ef7ed9d 100644 --- a/ttl-core/src/main/java/com/alibaba/ttl3/internal/util/ConcurrentReferenceHashMap.java +++ b/ttl-core/src/main/java/com/alibaba/ttl3/internal/util/ConcurrentReferenceHashMap.java @@ -73,7 +73,9 @@ * @author Juergen Hoeller */ @SuppressWarnings("ALL") -@SuppressFBWarnings("ALL") +// Is there a class annotation in FindBugs to ignore all warning in a file +// https://stackoverflow.com/questions/13398685 +@SuppressFBWarnings class ConcurrentReferenceHashMap extends AbstractMap implements ConcurrentMap { private static final int DEFAULT_INITIAL_CAPACITY = 16; diff --git a/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml b/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml index 56e789cfd..c1053cca2 100644 --- a/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml +++ b/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml @@ -38,19 +38,19 @@ maven-surefire-plugin - 3.2.2 + 3.3.1 maven-source-plugin - 3.3.0 + 3.3.1 maven-javadoc-plugin - 3.6.2 + 3.8.0 maven-deploy-plugin - 3.1.1 + 3.1.2 @@ -88,7 +88,7 @@ --> org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 initialize @@ -127,7 +127,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 diff --git a/ttl-integrations/vertx3-ttl-integration/pom.xml b/ttl-integrations/vertx3-ttl-integration/pom.xml index 0a05cb065..11fbbfd3a 100644 --- a/ttl-integrations/vertx3-ttl-integration/pom.xml +++ b/ttl-integrations/vertx3-ttl-integration/pom.xml @@ -116,7 +116,7 @@ --> org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 initialize diff --git a/ttl-integrations/vertx4-ttl-integration/pom.xml b/ttl-integrations/vertx4-ttl-integration/pom.xml index 6d17b4e9d..ac4c55a3d 100644 --- a/ttl-integrations/vertx4-ttl-integration/pom.xml +++ b/ttl-integrations/vertx4-ttl-integration/pom.xml @@ -123,7 +123,7 @@ --> org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.1 initialize