From 35e2a3e7a9b24a7e0572465dd8a036dd2c9c871b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 20:42:13 +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 spotbugs-annotations from 4.8.1 to 4.8.2 (#580) bump spotbugs-maven-plugin from 4.8.1.0 to 4.8.2.0 (#581) bump maven-javadoc-plugin from 3.6.2 to 3.6.3 (#582) bump spotbugs-annotations from 4.8.2 to 4.8.3 (#587) bump maven-surefire-plugin from 3.2.2 to 3.2.3 (#588) bump maven-compiler-plugin 3.11.0 to 3.12.0 (#589) bump byte-buddy-parent from 1.14.10 to 1.14.11 (#591) bump kotlin.version from 1.9.21 to 1.9.22 (#592) bump maven-compiler-plugin from 3.12.0 to 3.12.1 (#593) bump javassist from 3.29.2-GA to 3.30.2-GA (#594) bump maven-surefire-plugin from 3.2.3 to 3.2.5 (#596) bump spotbugs-maven-plugin 4.8.2.0 to 4.8.3.0 (#598) bump codecov/codecov-action from 3 to 4 (#600) bump junit-bom from 5.10.1 to 5.10.2 (#601) bump spotbugs-maven-plugin from 4.8.3.0 to 4.8.3.1 (#602) bump kotlinx-coroutines-bom from 1.7.3 to 1.8.0.(#603) bump byte-buddy-parent from 1.14.11 to 1.14.12 (#604) bump maven-shade-plugin from 3.5.1 to 3.5.2 (#606) bump exec-maven-plugin from 3.1.1 to 3.2.0 (#607) bump dokka-maven-plugin from 1.9.10 to 1.9.20 (#609) bump git-commit-id-maven-plugin from 7.0.0 to 8.0.0 (#610) bump kotlin.version from 1.9.22 to 1.9.23 (#611) bump git-commit-id-maven-plugin from 8.0.0 to 8.0.1 (#612) bump extra-enforcer-rules from 1.7.0 to 1.8.0 (#613) bump kotest.version from 5.8.0 to 5.8.1 (#614) bump maven-gpg-plugin from 3.1.0 to 3.2.0 (#615) bump maven-gpg-plugin from 3.2.0 to 3.2.1 (#616) bump maven-compiler-plugin from 3.12.1 to 3.13.0 (#617) bump git-commit-id-maven-plugin from 8.0.1 to 8.0.2 (#618) bump maven-gpg-plugin from 3.2.1 to 3.2.2 (#619) bump byte-buddy-parent from 1.14.12 to 1.14.13 (#620) bump jacoco-maven-plugin from 0.8.11 to 0.8.12 (#621) bump maven-source-plugin from 3.3.0 to 3.3.1 (#622) bump spotbugs-annotations from 4.8.3 to 4.8.4 (#623) --- .editorconfig | 26 +++++--- .github/workflows/strong_ci.yaml | 7 +- pom.xml | 66 ++++++++----------- src/versions-rules.xml | 29 -------- ttl-bom/pom.xml | 8 +-- .../util/ConcurrentReferenceHashMap.java | 4 +- .../pom.xml | 8 +-- 7 files changed, 56 insertions(+), 92 deletions(-) delete mode 100644 src/versions-rules.xml 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/strong_ci.yaml b/.github/workflows/strong_ci.yaml index f01ddf6db..decbce4ac 100644 --- a/.github/workflows/strong_ci.yaml +++ b/.github/workflows/strong_ci.yaml @@ -34,10 +34,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..61a00fc44 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.4 3.0.2 24.1.0 - 1.9.21 + 1.9.23 ${maven.compiler.source} - 1.7.3 + 1.8.0 - 1.9.10 + 1.9.20 8 2.0.7 - 5.10.1 - 5.8.0 + 5.10.2 + 5.8.1 net.bytebuddy byte-buddy-parent - 1.14.10 + 1.14.13 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 @@ -441,11 +439,11 @@ maven-compiler-plugin - 3.11.0 + 3.13.0 maven-surefire-plugin - 3.2.2 + 3.2.5 maven-jar-plugin @@ -453,7 +451,7 @@ maven-shade-plugin - 3.5.1 + 3.5.2 true @@ -463,11 +461,11 @@ maven-source-plugin - 3.3.0 + 3.3.1 maven-javadoc-plugin - 3.6.2 + 3.6.3 org.jetbrains.dokka @@ -488,7 +486,7 @@ maven-gpg-plugin - 3.1.0 + 3.2.2 maven-site-plugin @@ -509,17 +507,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.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.2.0 ${java.home}/bin/java test @@ -552,21 +550,10 @@ nexus-staging-maven-plugin 1.6.13 - - - org.codehaus.mojo - versions-maven-plugin - 2.16.2 - - file://${maven.multiModuleProjectDirectory}/src/versions-rules.xml - false - - + 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/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..ec136fd38 100644 --- a/ttl-bom/pom.xml +++ b/ttl-bom/pom.xml @@ -96,11 +96,11 @@ maven-source-plugin - 3.3.0 + 3.3.1 maven-javadoc-plugin - 3.6.2 + 3.6.3 maven-deploy-plugin @@ -109,7 +109,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 @@ -128,7 +128,7 @@ maven-gpg-plugin - 3.1.0 + 3.2.2 sign-artifacts 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..a1e3e33a5 100644 --- a/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml +++ b/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml @@ -38,15 +38,15 @@ maven-surefire-plugin - 3.2.2 + 3.2.5 maven-source-plugin - 3.3.0 + 3.3.1 maven-javadoc-plugin - 3.6.2 + 3.6.3 maven-deploy-plugin @@ -127,7 +127,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12