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 2022/03/03 07:49:45 UTC
[sling-parent] branch feature/SLING-11174-update-to-asf-parent-25 created (now 8567ce3)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/SLING-11174-update-to-asf-parent-25
in repository https://gitbox.apache.org/repos/asf/sling-parent.git.
at 8567ce3 SLING-11174 Update to ASF parent 25
This branch includes the following new commits:
new 8567ce3 SLING-11174 Update to ASF parent 25
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-parent] 01/01: SLING-11174 Update to ASF parent 25
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/SLING-11174-update-to-asf-parent-25
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
commit 8567ce3e63ba18f7e7c068645da6afb0b67a7c62
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 3 08:49:25 2022 +0100
SLING-11174 Update to ASF parent 25
---
pom.xml | 15 +--------------
sling-parent/pom.xml | 39 ++++++---------------------------------
2 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index 60cd1a4..872b45c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath />
</parent>
@@ -59,24 +59,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>3.0.0-M1</version>
<configuration>
<!-- don't deploy reactor module itself -->
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-output-timestamp-property</id>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index b9d55b9..667d7ac 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath />
</parent>
@@ -244,30 +244,16 @@
<pluginManagement>
<plugins>
- <!-- upgrade from 3.2.0 in ASF parent -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.2</version>
- </plugin>
- <!-- upgrade from 3.8.1 in ASF parent -->
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.9.0</version>
- </plugin>
- <!-- upgrade from 3.0.0-M4 in ASF parent -->
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M5</version>
- </plugin>
- <!-- upgrade from 1.4.1 in ASF parent -->
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <configuration>
+ <!-- workaround for https://issues.apache.org/jira/browse/MCOMPILER-485 -->
+ <createMissingPackageInfoClass>false</createMissingPackageInfoClass>
+ </configuration>
</plugin>
- <!-- update from 3.3.0 in ASF Parent, remove version again when upgrading to ASF Parent 25 -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.1</version>
<!-- this affects both direct invocation and execution in the context of site building (https://maven.apache.org/shared/maven-reporting-exec/) -->
<configuration>
<excludePackageNames>${javadoc.excludePackageNames}</excludePackageNames>
@@ -290,11 +276,6 @@
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
</configuration>
</plugin>
- <!-- upgrade from 3.6.1 in ASF parent -->
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${maven.plugin.tools.version}</version>
- </plugin>
<!-- only overwrite config for surefire/failsafe -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -308,14 +289,6 @@
<trimStackTrace>false</trimStackTrace>
</configuration>
</plugin>
- <!-- upgrade from 3.9.1 in ASF parent -->
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.10.0</version>
- <configuration>
- <relativizeDecorationLinks>false</relativizeDecorationLinks>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-jspc-plugin</artifactId>