diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2019-06-18 16:55:02 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-06-18 16:55:44 +0200 |
commit | 2d0a1adf0529d5d23c7752437d664784a2e4a578 (patch) | |
tree | ee5996267a5f24de82892218ae19fe7426cb76a2 | |
parent | 6d0168a4147226453cb1add5c278018d4603fcc4 (diff) | |
download | jgit-2d0a1adf0529d5d23c7752437d664784a2e4a578.tar.gz jgit-2d0a1adf0529d5d23c7752437d664784a2e4a578.zip |
Update Maven plugins and cleanup Maven warnings
update Maven plugins
- jacoco-maven-plugin to 0.8.4
- japicmp-maven-plugin to 0.14.1
- maven-compiler-plugin to 3.8.1
- maven-deploy-plugin to 3.0.0-M1
- maven-enforcer-plugin to 3.0.0-M2
- maven-install-plugin to 3.0.0-M1
- maven-jar-plugin to 3.1.2
- maven-javadoc-plugin to 3.1.0
- maven-jxr-plugin to 3.0.0
- maven-pmd-plugin to 3.12.0
- maven-resources-plugin to 3.1.0
- maven-shade-plugin to 3.2.1
- maven-source-plugin to 3.1.0
- maven-surefire-plugin to 3.0.0-M3
- spotbugs-maven-plugin to 3.1.12
- tycho to 1.3.0
- tycho-pack200a-plugin to 1.3.0
- tycho-pack200b-plugin to 1.3.0
Cleanup Maven warnings
- pin version of all used Maven plugins
- remove deprecated way to declare minimum Maven version
Change-Id: If23e2e2bb03e5e1e7b1eb9d4924a8faa0aa3704e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 40 | ||||
-rw-r--r-- | org.eclipse.jgit.test/pom.xml | 1 | ||||
-rw-r--r-- | org.eclipse.jgit/pom.xml | 1 | ||||
-rw-r--r-- | pom.xml | 51 |
4 files changed, 73 insertions, 20 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index d763cb03b9..879755e15f 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -47,10 +47,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <groupId>org.eclipse.jgit</groupId> <artifactId>jgit.tycho.parent</artifactId> <version>5.1.9-SNAPSHOT</version> @@ -59,7 +55,7 @@ <name>JGit Tycho Parent</name> <properties> - <tycho-version>1.2.0</tycho-version> + <tycho-version>1.3.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <target-platform>jgit-4.6</target-platform> </properties> @@ -224,6 +220,21 @@ <version>${tycho-version}</version> </plugin> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-publisher-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-packaging-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-pack200a-plugin</artifactId> <version>${tycho-extras-version}</version> @@ -243,6 +254,25 @@ <artifactId>build-helper-maven-plugin</artifactId> <version>3.0.0</version> </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.1.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.7.1</version> + </plugin> </plugins> </pluginManagement> </build> diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 7a4d58017d..f42eb54eda 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -123,6 +123,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin-version}</version> <configuration> <argLine>-Djgit.test.long=true</argLine> </configuration> diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index eedb5e80d7..cb35c2fb66 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -209,6 +209,7 @@ <plugin> <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId> + <version>${spotbugs-maven-plugin-version}</version> <configuration> <excludeFilterFile>findBugs/FindBugsExcludeFilter.xml</excludeFilterFile> </configuration> @@ -208,17 +208,18 @@ <osgi-core-version>4.3.1</osgi-core-version> <servlet-api-version>3.1.0</servlet-api-version> <jetty-version>9.4.11.v20180605</jetty-version> - <japicmp-version>0.13.0</japicmp-version> + <japicmp-version>0.14.1</japicmp-version> <httpclient-version>4.5.5</httpclient-version> <httpcore-version>4.4.9</httpcore-version> <slf4j-version>1.7.2</slf4j-version> <log4j-version>1.2.15</log4j-version> - <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version> - <tycho-extras-version>1.2.0</tycho-extras-version> + <maven-javadoc-plugin-version>3.1.0</maven-javadoc-plugin-version> + <tycho-extras-version>1.3.0</tycho-extras-version> <gson-version>2.8.2</gson-version> - <spotbugs-maven-plugin-version>3.1.6</spotbugs-maven-plugin-version> - <maven-surefire-report-plugin-version>2.21.0</maven-surefire-report-plugin-version> - <maven-compiler-plugin-version>3.8.0</maven-compiler-plugin-version> + <spotbugs-maven-plugin-version>3.1.12</spotbugs-maven-plugin-version> + <maven-surefire-plugin-version>3.0.0-M3</maven-surefire-plugin-version> + <maven-surefire-report-plugin-version>${maven-surefire-plugin-version}</maven-surefire-report-plugin-version> + <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version> <!-- Properties to enable jacoco code coverage analysis --> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> @@ -250,7 +251,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.0</version> + <version>3.1.2</version> <configuration> <archive> <manifestEntries> @@ -275,7 +276,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.1.1</version> + <version>3.2.1</version> </plugin> <plugin> @@ -293,7 +294,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>3.0.1</version> + <version>3.1.0</version> </plugin> <plugin> @@ -305,7 +306,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.21.0</version> + <version>${maven-surefire-plugin-version}</version> <configuration> <forkCount>${test-fork-count}</forkCount> <reuseForks>true</reuseForks> @@ -338,7 +339,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.10.0</version> + <version>3.12.0</version> <configuration> <sourceEncoding>utf-8</sourceEncoding> <minimumTokens>100</minimumTokens> @@ -376,7 +377,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.1</version> + <version>0.8.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -398,12 +399,32 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.5</version> + <version>3.0.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.9</version> + <version>3.0.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>3.0.0-M1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin-version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> </plugin> </plugins> </pluginManagement> @@ -412,7 +433,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M1</version> + <version>3.0.0-M2</version> <executions> <execution> <id>enforce-maven</id> |