You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2023/04/02 05:06:51 UTC
[shardingsphere] branch master updated: Refactor root pom (#24946)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 3e63c15c7af Refactor root pom (#24946)
3e63c15c7af is described below
commit 3e63c15c7af4a189e1354fa9435ea794fd829464
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Apr 2 13:06:35 2023 +0800
Refactor root pom (#24946)
---
infra/util/pom.xml | 1 -
pom.xml | 110 +++++++++++++++++++++--------------------------------
2 files changed, 44 insertions(+), 67 deletions(-)
diff --git a/infra/util/pom.xml b/infra/util/pom.xml
index 7e4c17449b7..67f9c845aae 100644
--- a/infra/util/pom.xml
+++ b/infra/util/pom.xml
@@ -52,7 +52,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
diff --git a/pom.xml b/pom.xml
index 38992bed93d..a956b8a77f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,21 +114,20 @@
<!-- Plugin versions -->
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
- <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+ <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
- <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+ <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
<maven-release-plugin.version>3.0.0</maven-release-plugin.version>
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
- <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version>
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
<maven-site-plugin.version>4.0.0-M6</maven-site-plugin.version>
<maven-project-info-reports-plugin.version>3.4.2</maven-project-info-reports-plugin.version>
<maven-jxr-plugin.version>3.3.0</maven-jxr-plugin.version>
- <maven-plugin-plugin.version>3.8.1</maven-plugin-plugin.version>
<apache-rat-plugin.version>0.15</apache-rat-plugin.version>
<jandex-maven-plugin.version>3.0.5</jandex-maven-plugin.version>
@@ -684,17 +683,32 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>${maven-source-plugin.version}</version>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>enforce-banned-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>${maven.version.range}</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>${java.version}</version>
+ </requireJavaVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
@@ -705,6 +719,23 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>${maven-jar-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>${maven-source-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ <phase>verify</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
@@ -748,30 +779,6 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
- <executions>
- <execution>
- <id>enforce-banned-dependencies</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>${maven.version.range}</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>${java.version}</version>
- </requireJavaVersion>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
</plugin>
@@ -780,21 +787,11 @@
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<source>${java.version}</source>
+ <charset>${project.build.sourceEncoding}</charset>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <docencoding>${project.build.sourceEncoding}</docencoding>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${maven-plugin-plugin.version}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>default-descriptor</id>
- <phase>process-classes</phase>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -901,23 +898,9 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <charset>${project.build.sourceEncoding}</charset>
- <encoding>${project.build.sourceEncoding}</encoding>
- <docencoding>${project.build.sourceEncoding}</docencoding>
- </configuration>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -1108,11 +1091,6 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <charset>${project.build.sourceEncoding}</charset>
- <encoding>${project.build.sourceEncoding}</encoding>
- <docencoding>${project.build.sourceEncoding}</docencoding>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>