You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2022/05/25 04:53:37 UTC
[rocketmq] branch develop updated: Formatting code of maven dependencies management (#4371)
This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 65a8525a6 Formatting code of maven dependencies management (#4371)
65a8525a6 is described below
commit 65a8525a6045bf79ffd4b2984528b9b8b36892b1
Author: Aaron Ai <ya...@alibaba-inc.com>
AuthorDate: Wed May 25 12:53:19 2022 +0800
Formatting code of maven dependencies management (#4371)
---
broker/pom.xml | 2 +-
client/pom.xml | 4 -
example/pom.xml | 2 -
pom.xml | 235 ++++++++++++++++++++++++++++++++++++++++----------------
store/pom.xml | 1 -
test/pom.xml | 6 --
6 files changed, 170 insertions(+), 80 deletions(-)
diff --git a/broker/pom.xml b/broker/pom.xml
index fee6d9ea2..23cf55797 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -76,7 +76,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
diff --git a/client/pom.xml b/client/pom.xml
index 51e53194f..703033ed2 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -50,14 +50,10 @@
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
- <version>0.33.0</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
- <version>0.33.0</version>
- <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/example/pom.xml b/example/pom.xml
index 2de906269..e415537da 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -55,12 +55,10 @@
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-core</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>io.jaegertracing</groupId>
<artifactId>jaeger-client</artifactId>
- <version>1.6.0</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 3bbc8de4c..f53b3d8d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,57 @@
<!-- Compiler settings properties -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
+
+ <slf4j.version>1.7.7</slf4j.version>
+ <logback.version>1.2.10</logback.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <netty.version>4.1.65.Final</netty.version>
+ <bcpkix-jdk15on.version>1.69</bcpkix-jdk15on.version>
+ <fastjson.version>1.2.83</fastjson.version>
+ <javassist.version>3.20.0-GA</javassist.version>
+ <jna.version>4.2.2</jna.version>
+ <commons-lang3.version>3.4</commons-lang3.version>
+ <guava.version>31.0.1-jre</guava.version>
+ <openmessaging.version>0.3.1-alpha</openmessaging.version>
+ <log4j.version>1.2.17</log4j.version>
+ <snakeyaml.version>1.30</snakeyaml.version>
+ <commons-codec.version>1.9</commons-codec.version>
+ <logging-log4j.version>2.17.1</logging-log4j.version>
+ <commons-validator.version>1.7</commons-validator.version>
+ <zstd-jni.version>1.5.2-2</zstd-jni.version>
+ <lz4-java.version>1.8.0</lz4-java.version>
+ <opentracing.version>0.33.0</opentracing.version>
+ <jaeger.version>1.6.0</jaeger.version>
+ <dleger.version>0.2.4</dleger.version>
+ <extra-enforcer-rules.version>1.0-beta-4</extra-enforcer-rules.version>
+
+ <!-- Test dependencies -->
+ <junit.version>4.13.2</junit.version>
+ <assertj-core.version>2.6.0</assertj-core.version>
+ <mockito-core.version>3.10.0</mockito-core.version>
+ <awaitility.version>4.1.0</awaitility.version>
+ <truth.version>0.30</truth.version>
+
+ <!-- Build plugin dependencies -->
+ <versions-maven-plugin.version>2.2</versions-maven-plugin.version>
+ <dependency-mediator-maven-plugin.version>1.0.2</dependency-mediator-maven-plugin.version>
+ <clirr-maven-plugin.version>2.7</clirr-maven-plugin.version>
+ <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
+ <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+ <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+ <maven-help-plugin.version>2.2</maven-help-plugin.version>
+ <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
+ <apache-rat-plugin.version>0.12</apache-rat-plugin.version>
+ <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+ <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+ <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+ <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
+ <sonar-maven-plugin.version>3.0.2</sonar-maven-plugin.version>
+ <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
+ <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
+ <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
<!-- Exclude all generated code -->
<sonar.jacoco.itReportPath>${project.basedir}/../test/target/jacoco-it.exec</sonar.jacoco.itReportPath>
@@ -128,21 +179,21 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.2</version>
+ <version>${versions-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.vongosling</groupId>
<artifactId>dependency-mediator-maven-plugin</artifactId>
- <version>1.0.2</version>
+ <version>${dependency-mediator-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
- <version>2.7</version>
+ <version>${clirr-maven-plugin.version}</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-ban-circular-dependencies</id>
@@ -161,13 +212,13 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
- <version>1.0-beta-4</version>
+ <version>${extra-enforcer-rules.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
@@ -178,7 +229,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>3.0.1</version>
+ <version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -190,7 +241,7 @@
</plugin>
<plugin>
<artifactId>maven-help-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven-help-plugin.version}</version>
<executions>
<execution>
<id>generate-effective-dependencies-pom</id>
@@ -203,7 +254,7 @@
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${maven-checkstyle-plugin.version}</version>
<executions>
<execution>
<id>verify</id>
@@ -224,7 +275,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.12</version>
+ <version>${apache-rat-plugin.version}</version>
<configuration>
<excludes>
<exclude>.gitignore</exclude>
@@ -245,7 +296,7 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${maven-resources-plugin.version}</version>
<configuration>
<!-- We are not suppose to setup the customer resources here-->
<encoding>${project.build.sourceEncoding}</encoding>
@@ -254,12 +305,12 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
- <version>4.3.0</version>
+ <version>${coveralls-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.5</version>
+ <version>${jacoco-maven-plugin.version}</version>
<executions>
<execution>
<id>default-prepare-agent</id>
@@ -297,7 +348,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${maven-surefire-plugin.version}</version>
<configuration>
<skipAfterFailureCount>1</skipAfterFailureCount>
<forkCount>1</forkCount>
@@ -310,12 +361,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.4</version>
+ <version>${findbugs-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.0.2</version>
+ <version>${sonar-maven-plugin.version}</version>
</plugin>
</plugins>
@@ -323,7 +374,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.0.0</version>
+ <version>${maven-assembly-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
@@ -340,7 +391,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
@@ -351,7 +402,7 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
+ <version>${maven-javadoc-plugin.version}</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
@@ -391,7 +442,7 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.19.1</version>
+ <version>${maven-failsafe-plugin.version}</version>
<configuration>
<argLine>@{failsafeArgLine}</argLine>
<excludes>
@@ -419,33 +470,6 @@
</profile>
</profiles>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.assertj</groupId>
- <artifactId>assertj-core</artifactId>
- <version>2.6.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.10.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>4.1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -521,100 +545,179 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.2.10</version>
+ <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.1.65.Final</version>
+ <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<scope>runtime</scope>
<type>jar</type>
- <version>1.69</version>
+ <version>${bcpkix-jdk15on.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.83</version>
+ <version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
- <version>3.20.0-GA</version>
+ <version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
- <version>4.2.2</version>
+ <version>${jna.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>io.openmessaging</groupId>
<artifactId>openmessaging-api</artifactId>
- <version>0.3.1-alpha</version>
+ <version>${openmessaging.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.30</version>
+ <version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.9</version>
+ <version>${commons-codec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.17.1</version>
+ <version>${logging-log4j.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.17.1</version>
+ <version>${logging-log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.7</version>
+ <version>${commons-validator.version}</version>
</dependency>
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
- <version>1.5.2-2</version>
+ <version>${zstd-jni.version}</version>
</dependency>
<dependency>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
- <version>1.8.0</version>
+ <version>${lz4-java.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-api</artifactId>
+ <version>${opentracing.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.opentracing</groupId>
+ <artifactId>opentracing-mock</artifactId>
+ <version>${opentracing.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-core</artifactId>
+ <version>${jaeger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jaegertracing</groupId>
+ <artifactId>jaeger-client</artifactId>
+ <version>${jaeger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.openmessaging.storage</groupId>
+ <artifactId>dledger</artifactId>
+ <version>${dleger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj-core.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <version>${truth.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/store/pom.xml b/store/pom.xml
index 888403170..9f6cca088 100644
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -31,7 +31,6 @@
<dependency>
<groupId>io.openmessaging.storage</groupId>
<artifactId>dledger</artifactId>
- <version>0.2.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.rocketmq</groupId>
diff --git a/test/pom.xml b/test/pom.xml
index 278da0b06..e75ed195d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -43,19 +43,14 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>0.30</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.28.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -65,7 +60,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>rocketmq-tools</artifactId>
</dependency>
-
</dependencies>
<build>