You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/04/18 11:26:01 UTC
[sling-parent] branch master updated: SLING-9307 do no longer
downgrade plugins which are already managed at ASF parent 23
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
The following commit(s) were added to refs/heads/master by this push:
new cd2cce8 SLING-9307 do no longer downgrade plugins which are already managed at ASF parent 23
cd2cce8 is described below
commit cd2cce804cc6cadb652e84944bdbe6f23576ba91
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Sat Apr 18 13:25:50 2020 +0200
SLING-9307 do no longer downgrade plugins which are already managed at
ASF parent 23
---
sling-parent/pom.xml | 102 +++++++++++++++------------------------------------
1 file changed, 30 insertions(+), 72 deletions(-)
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index 1367295..109852b 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -58,7 +58,7 @@
<sling.java.version>8</sling.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <surefire.plugin.version>3.0.0-M4</surefire.plugin.version>
+ <surefire.version>3.0.0-M4</surefire.version>
</properties>
<scm>
@@ -280,16 +280,13 @@
<pluginManagement>
<plugins>
+ <!-- upgrade from 1.4.1 in ASF parent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- </plugin>
+ <!-- upgrade from 3.0.1 in ASF parent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -300,36 +297,13 @@
<artifactId>maven-changes-plugin</artifactId>
<version>2.12.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-jspc-plugin</artifactId>
- <version>2.0.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>maven-jcrocm-plugin</artifactId>
- <version>2.0.4-incubator</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
- </plugin>
+ <!-- upgrade from 2.5.2 in ASF parent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
+ <!-- upgrade from 2.8.2 in ASF parent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
@@ -340,13 +314,33 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>3.1.1</version>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <!-- declare dependencies here rather than where needed to
+ circumvent http://jira.codehaus.org/browse/MANTRUN-51
+ -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-regexp</artifactId>
+ <version>1.7.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <version>1.4</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.2.2</version>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-jspc-plugin</artifactId>
+ <version>2.0.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-jcrocm-plugin</artifactId>
+ <version>2.0.4-incubator</version>
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
@@ -381,27 +375,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <dependencies>
- <!-- declare dependencies here rather than where needed to
- circumvent http://jira.codehaus.org/browse/MANTRUN-51
- -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-apache-regexp</artifactId>
- <version>1.7.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- <version>1.4</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
@@ -417,21 +390,6 @@
<version>0.8.3</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- </plugin>
- <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
<version>1.4.0</version>