Skip to content

Commit

Permalink
[KYUUBI #4097] Align maven plugin versions to Apache parent pom bumpe…
Browse files Browse the repository at this point in the history
…d to version 29

### _Why are the changes needed?_

1. Bump Apache parent pom from version `27` to `29`
2. remove duplicate or explicit maven plugin version params, use versions in parent pom instead.

[1] Apache Parent Pom diffs 27 vs 29 apache/maven-apache-parent@apache-27...apache-29
[2] Diff in removed explicit maven plugin version:

maven plugin name | previous explicit version | version in apache pom parent 29 | updated / unchanged
-- | -- | -- | --
antrun | 3.0.0 | 3.1.0 | upgraded
assembly | 3.2.0 | 3.4.2 | upgraded
clean | 3.1.0 | 3.2.0 | upgraded
compiler | 3.8.1 | 3.10.1 | upgraded
dependency | 3.1.1 | 3.4.0 | upgraded
deply | 3.0.0-M1 | 2.8.2 | downgraded
gpg | 3.0.1 | 3.0.1 | upgraded
javadoc | 3.3.0 | 3.4.4 | upgraded
help | 3.2.0 | 3.3.0 | upgraded
jar | 3.2.0 | 3.3.0 | upgraded
shade | 3.4.1 | 3.4.1 | Pinned to 3.4.1 (unchanged)
surefire | 3.0.0-M7 | 2.22.2 | Pinned to 3.0.0-M7 (unchanged)
rat | 0.13 | 0.15 | upgraded
source | 3.2.1 | 3.2.1 | unchanged

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #4097 from bowenliang123/pom-apache29.

Closes #4097

8576f01 [liangbowen] Revert "restore maven.plugin.download.version"
47f817d [liangbowen] restore maven.plugin.download.version
fb26cf2 [liangbowen] restore maven.plugin.shade.version
d1408aa [liangbowen] remove redundant empty plugin definition in the dependencyManagement block
ac3c73e [liangbowen] remove following versions: maven.plugin.compiler.version, maven.plugin.dependency.version, maven.plugin.deploy.version, maven.plugin.gpg.version, maven.plugin.javadoc.version, maven.plugin.jar.version, maven.plugin.shade.version, maven.plugin.source.version, maven.plugin.rat.version
95c9f28 [liangbowen] remove maven.plugin.clean.version
6efa73e [liangbowen] remove maven.plugin.antrun.version
c22e903 [liangbowen] bump apache maven parent version from 27 to 29

Authored-by: liangbowen <liangbowen@gf.com.cn>
Signed-off-by: Cheng Pan <chengpan@apache.org>
  • Loading branch information
bowenliang123 authored and pan3793 committed Jan 5, 2023
1 parent 32b06c6 commit 6ec275e
Showing 1 changed file with 1 addition and 53 deletions.
54 changes: 1 addition & 53 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>27</version>
<version>29</version>
</parent>

<groupId>org.apache.kyuubi</groupId>
Expand Down Expand Up @@ -210,29 +210,18 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jars.target.dir>${project.build.directory}/scala-${scala.binary.version}/jars</jars.target.dir>

<maven.plugin.antrun.version>3.0.0</maven.plugin.antrun.version>
<maven.plugin.assembly.version>3.2.0</maven.plugin.assembly.version>
<maven.plugin.build.helper.version>3.2.0</maven.plugin.build.helper.version>
<maven.plugin.clean.version>3.1.0</maven.plugin.clean.version>
<maven.plugin.compiler.version>3.8.1</maven.plugin.compiler.version>
<maven.plugin.dependency.version>3.1.1</maven.plugin.dependency.version>
<maven.plugin.deploy.version>3.0.0-M1</maven.plugin.deploy.version>
<maven.plugin.download.version>1.6.6</maven.plugin.download.version>
<maven.plugin.gpg.version>3.0.1</maven.plugin.gpg.version>
<maven.plugin.javadoc.version>3.3.0</maven.plugin.javadoc.version>
<maven.plugin.scala.version>4.6.1</maven.plugin.scala.version>
<maven.plugin.surefire.version>3.0.0-M7</maven.plugin.surefire.version>
<maven.plugin.scalatest.version>2.0.2</maven.plugin.scalatest.version>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.HudiTest</maven.plugin.scalatest.exclude.tags>
<maven.plugin.scalatest.include.tags></maven.plugin.scalatest.include.tags>
<maven.plugin.spotless.version>2.27.2</maven.plugin.spotless.version>
<maven.plugin.jacoco.version>0.8.7</maven.plugin.jacoco.version>
<maven.plugin.jar.version>3.2.0</maven.plugin.jar.version>
<maven.plugin.scalastyle.version>1.0.0</maven.plugin.scalastyle.version>
<maven.plugin.shade.version>3.4.1</maven.plugin.shade.version>
<maven.plugin.silencer.version>1.7.10</maven.plugin.silencer.version>
<maven.plugin.source.version>3.2.1</maven.plugin.source.version>
<maven.plugin.rat.version>0.13</maven.plugin.rat.version>

<maven.scaladoc.skip>false</maven.scaladoc.skip>
<maven.scalastyle.skip>false</maven.scalastyle.skip>
Expand Down Expand Up @@ -1690,7 +1679,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven.plugin.antrun.version}</version>
<executions>
<execution>
<id>create-tmp-dir</id>
Expand Down Expand Up @@ -1758,7 +1746,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.plugin.compiler.version}</version>
<configuration>
<maxmem>1024m</maxmem>
<fork>true</fork>
Expand Down Expand Up @@ -1909,22 +1896,9 @@
<version>${maven.plugin.shade.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven.plugin.jar.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.plugin.assembly.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven.plugin.dependency.version}</version>
<executions>
<execution>
<id>default-cli</id>
Expand Down Expand Up @@ -1965,7 +1939,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven.plugin.clean.version}</version>
<configuration>
<filesets>
<fileset>
Expand All @@ -1990,30 +1963,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven.plugin.deploy.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven.plugin.source.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.plugin.javadoc.version}</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven.plugin.gpg.version}</version>
</plugin>

<plugin>
<groupId>org.scalastyle</groupId>
<artifactId>scalastyle-maven-plugin</artifactId>
Expand Down Expand Up @@ -2106,7 +2055,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>${maven.plugin.rat.version}</version>
<inherited>true</inherited>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
Expand Down

0 comments on commit 6ec275e

Please sign in to comment.