aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2020-09-02 07:58:47 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2020-09-02 07:58:47 -0400
commit14d5a7497f2f599d6bc24dbccd90a2a22ccbd599 (patch)
tree5c07f816d665e91f48f5b45a505c98b98cbf511b
parent8b589b3bf264075d5748b10197d226a452c4422b (diff)
parent68fbd7817c950135df007b79b5863f23c55108b5 (diff)
downloadjgit-14d5a7497f2f599d6bc24dbccd90a2a22ccbd599.tar.gz
jgit-14d5a7497f2f599d6bc24dbccd90a2a22ccbd599.zip
Merge changes Ib0b2dc7c,I827da397 into stable-5.9
* changes: Upgrade maven-resources-plugin to 3.2.0 Upgrade plexus-compiler version to 2.8.8
-rw-r--r--org.eclipse.jgit.packaging/pom.xml2
-rw-r--r--pom.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 52d7b49854..141de30930 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -212,7 +212,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<configuration>
<encoding>ISO-8859-1</encoding>
</configuration>
diff --git a/pom.xml b/pom.xml
index d102b3f91c..e158809e1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
<maven-surefire-plugin-version>3.0.0-M4</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>
- <plexus-compiler-version>2.8.7</plexus-compiler-version>
+ <plexus-compiler-version>2.8.8</plexus-compiler-version>
<!-- Properties to enable jacoco code coverage analysis -->
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@@ -384,7 +384,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>