chore(deps): upgrade dependencies/plugins 🛠️

bump com.github.spotbugs:spotbugs-annotations from 4.8.1 to 4.8.2 (#580) bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.1.0 to 4.8.2.0 (#581) bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 (#582) bump com.github.spotbugs:spotbugs-annotations from 4.8.2 to 4.8.3 (#587) bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 (#588) bump org.apache.maven.plugins:maven-compiler-plugin 3.11.0 to 3.12.0 (#589) bump net.bytebuddy: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 org.apache.maven.plugins:maven-compiler-plugin from 3.12.0 to 3.12.1 (#593) bump org.javassist:javassist from 3.29.2-GA to 3.30.2-GA (#594)
alibaba · Dec 29, 2023 · caaa6bc · caaa6bc
1 parent efc5d4d
commit caaa6bc
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 71 deletions.
diff --git 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/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -79,11 +79,11 @@
 			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.3</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.22</kotlin.version>
 		<kotlin.compiler.jvmTarget>${maven.compiler.source}</kotlin.compiler.jvmTarget>
 		<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
 		<!-- https://kotlin.github.io/dokka/1.7.10/user_guide/maven/usage/ -->
@@ -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.11</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -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>
@@ -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>
@@ -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>
@@ -441,11 +439,11 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.11.0</version>
+					<version>3.12.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.2.2</version>
+					<version>3.2.3</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-jar-plugin</artifactId>
@@ -467,7 +465,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.6.2</version>
+					<version>3.6.3</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jetbrains.dokka</groupId>
@@ -514,7 +512,7 @@
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.8.1.0</version>
+					<version>4.8.2.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
@@ -552,18 +550,6 @@
 					<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>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -607,10 +593,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 +611,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>

diff --git a/src/versions-rules.xml b/src/versions-rules.xml
diff --git a/ttl-bom/pom.xml b/ttl-bom/pom.xml
@@ -100,7 +100,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.6.2</version>
+					<version>3.6.3</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>

diff --git a/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml b/ttl-integrations/sample-ttl-agent-extension-transformlet/pom.xml
@@ -38,15 +38,15 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.2.2</version>
+					<version>3.2.3</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
 					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.6.2</version>
+					<version>3.6.3</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-deploy-plugin</artifactId>