Skip to content

Commit

Permalink
chore(deps): upgrade dependencies/plugins 🛠️
Browse files Browse the repository at this point in the history 
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)
bump maven-gpg-plugin from 3.2.2 to 3.2.3 (#627)
bump maven-jar-plugin from 3.3.0 to 3.4.0 (#628)
bump maven-gpg-plugin from 3.2.3 to 3.2.4 (#630)
bump maven-jar-plugin from 3.4.0 to 3.4.1 (#631)
bump byte-buddy-parent from 1.14.13 to 1.14.14 (#632)
bump maven-shade-plugin from 3.5.2 to 3.5.3 (#633)
bump maven-install-plugin from 3.1.1 to 3.1.2 (#636)
bump maven-deploy-plugin from 3.1.1 to 3.1.2 (#637)
bump spotbugs-annotations from 4.8.4 to 4.8.5 (#639)
bump kotlin.version from 1.9.23 to 1.9.24 (#643)
bump byte-buddy-parent from 1.14.14 to 1.14.15 (#644)
bump kotest.version from 5.8.1 to 5.9.0 (#645)
bump kotlinx-coroutines-bom from 1.8.0 to 1.8.1 (#646)
bump exec-maven-plugin from 3.2.0 to 3.3.0 (#650)
bump byte-buddy-parent from 1.14.15 to 1.14.16 (#651)
bump nexus-staging-maven-plugin from 1.6.13 to 1.7.0 (#652)
bump byte-buddy-parent from 1.14.16 to 1.14.17 (#654)
bump maven-enforcer-plugin from 3.4.1 to 3.5.0 (#655)
bump maven-javadoc-plugin from 3.6.3 to 3.7.0 (#656)
bump maven-shade-plugin from 3.5.3 to 3.6.0 (#657)
bump kotest.version from 5.9.0 to 5.9.1 (#658)
bump git-commit-id-maven-plugin from 8.0.2 to 9.0.0 (#659)
bump maven-dependency-plugin from 3.6.1 to 3.7.0 (#660)
bump maven-surefire-plugin from 3.2.5 to 3.3.0.(#661)
bump spotbugs-annotations from 4.8.5 to 4.8.6 (#662)
bump maven-jar-plugin from 3.4.1 to 3.4.2 (#663)
bump maven-clean-plugin from 3.3.2 to 3.4.0 (#664)
bump maven-dependency-plugin from 3.7.0 to 3.7.1 (#666)
bump junit-bom from 5.10.2 to 5.10.3 (#670)
bump git-commit-id-maven-plugin from 9.0.0 to 9.0.1 (#672)
bump byte-buddy-parent from 1.14.17 to 1.14.18 (#673)
bump maven-surefire-plugin from 3.3.0 to 3.3.1 (#674)
bump maven-javadoc-plugin from 3.7.0 to 3.8.0 (#675)
bump kotlin.version from 1.9.24 to 1.9.25 (#676)
bump exec-maven-plugin from 3.3.0 to 3.4.0 (#678)
bump maven-gpg-plugin from 3.2.4 to 3.2.5 (#680)
bump exec-maven-plugin from 3.4.0 to 3.4.1 (#681)
bump junit-bom from 5.10.3 to 5.11.0 (#683)
  • Loading branch information
@dependabot @oldratlee
dependabot[bot] authored and oldratlee committed Aug 15, 2024
1 parent 5e26312 commit c9beab0
Show file tree
Hide file tree
Showing 11 changed files with 71 additions and 105 deletions.
26 changes: 16 additions & 10 deletions .editorconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/strong_ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
11
17
21
22
distribution: zulu
cache: maven

Expand All @@ -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
Expand Down
78 changes: 32 additions & 46 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.alibaba.ttl3</groupId>
Expand Down Expand Up @@ -28,8 +28,8 @@
<url>https://github.com/alibaba/transmittable-thread-local</url>
</scm>
<issueManagement>
<url>https://github.com/alibaba/transmittable-thread-local/issues</url>
<system>GitHub Issues</system>
<url>https://github.com/alibaba/transmittable-thread-local/issues</url>
</issueManagement>
<ciManagement>
<system>GitHub Actions</system>
Expand Down Expand Up @@ -79,22 +79,22 @@
https://alibaba.github.io/transmittable-thread-local/apidocs/${project.version}
</javadoc.ttl.base.link>

<spotbugs.annotations.version>4.8.1</spotbugs.annotations.version>
<spotbugs.annotations.version>4.8.6</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.25</kotlin.version>
<kotlin.compiler.jvmTarget>${maven.compiler.source}</kotlin.compiler.jvmTarget>
<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
<kotlin.coroutine.version>1.8.1</kotlin.coroutine.version>
<!-- https://kotlin.github.io/dokka/1.7.10/user_guide/maven/usage/ -->
<dokka.version>1.9.10</dokka.version>
<dokka.version>1.9.20</dokka.version>
<dokka.link.jdk.version>8</dokka.link.jdk.version>

<slf4j.version>2.0.7</slf4j.version>

<!-- testing dependencies versions -->
<junit5.version>5.10.1</junit5.version>
<kotest.version>5.8.0</kotest.version>
<junit5.version>5.11.0</junit5.version>
<kotest.version>5.9.1</kotest.version>

<!--
slf4j simple logger configuration for test
Expand Down Expand Up @@ -196,7 +196,7 @@
<!-- https://github.com/raphw/byte-buddy/issues/1264 -->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-parent</artifactId>
<version>1.14.10</version>
<version>1.14.18</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -255,7 +255,7 @@
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.29.2-GA</version>
<version>3.30.2-GA</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -402,9 +402,6 @@
</execution>
</executions>
</plugin>
<!--
official docs: https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html
-->
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
Expand All @@ -415,6 +412,7 @@
</goals>
<configuration>
<rules>
<!-- official docs: https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html -->
<requireMavenVersion>
<version>3.3.9</version>
</requireMavenVersion>
Expand All @@ -428,7 +426,7 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
Expand All @@ -441,19 +439,19 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.2</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.2</version>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.6.0</version>
<configuration>
<shadeSourcesContent>true</shadeSourcesContent>
<dependencyReducedPomLocation>
Expand All @@ -463,11 +461,11 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
Expand All @@ -488,38 +486,38 @@
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.5</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>7.0.0</version>
<version>9.0.1</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.8.1.0</version>
<version>4.8.3.1</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<version>0.8.12</version>
</plugin>
<plugin>
<!--
Expand All @@ -528,7 +526,7 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<version>3.4.1</version>
<configuration>
<executable>${java.home}/bin/java</executable>
<classpathScope>test</classpathScope>
Expand All @@ -550,23 +548,12 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
</plugin>
<plugin>
<!--
config example: https://github.com/mojohaus/versions-maven-plugin/issues/157#issuecomment-306041074
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.2</version>
<configuration>
<rulesUri>file://${maven.multiModuleProjectDirectory}/src/versions-rules.xml</rulesUri>
<generateBackupPoms>false</generateBackupPoms>
</configuration>
<version>1.7.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>gen-src</id>
Expand Down Expand Up @@ -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
Expand All @@ -625,7 +612,6 @@
<plugin>
<!--
https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html
https://docs.oracle.com/en/java/javase/21/javadoc/javadoc-command.html
-->
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -873,7 +859,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
1 change: 1 addition & 0 deletions scripts/integration-test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ readonly JDK_VERSIONS=(
11
"$default_build_jdk_version"
21
22
)

# here use `install` and `-D performRelease` intended
Expand Down
29 changes: 0 additions & 29 deletions src/versions-rules.xml
View file

This file was deleted.

12 changes: 6 additions & 6 deletions ttl-bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,20 @@
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.2</version>
<version>3.8.0</version>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</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>
Expand All @@ -128,7 +128,7 @@
<plugins>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -155,7 +155,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down
Loading

0 comments on commit c9beab0

Please sign in to comment.