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 2021/07/20 09:29:43 UTC
[sling-parent] 01/01: Update to ASF Parent 24
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/SLING-10613-update-to-asf-parent-24
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
commit a4558bcb1a2a0233a7370dae92e652cfdbe0f637
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jul 20 11:29:27 2021 +0200
Update to ASF Parent 24
Get rid of redundant configuration
---
sling-parent/pom.xml | 91 +++++++++-------------------------------------------
1 file changed, 16 insertions(+), 75 deletions(-)
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index ee2b8db..f41fd52 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath />
</parent>
@@ -61,6 +61,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<surefire.version>3.0.0-M4</surefire.version>
+ <minimalMavenBuildVersion>3.3.9</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>1.8</minimalJavaBuildVersion>
</properties>
<scm>
@@ -112,8 +114,7 @@
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
- <!-- override execution id defined in ASF parent (not supported via property yet, https://issues.apache.org/jira/browse/MPOM-247) -->
- <id>enforce-maven-version</id>
+ <id>enforce-sling-java-version</id>
<goals>
<goal>enforce</goal>
</goals>
@@ -126,13 +127,6 @@
The value of the "sling.java.version" property should comply with the following pattern: ^(8|9|1[0-9])$.
</regexMessage>
</requireProperty>
- <requireJavaVersion>
- <version>1.8.0</version>
- <message>Apache Sling must be compiled with Java 8 or higher.</message>
- </requireJavaVersion>
- <requireMavenVersion>
- <version>3.3.9</version>
- </requireMavenVersion>
</rules>
</configuration>
</execution>
@@ -195,7 +189,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M4</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.release</groupId>
@@ -254,29 +247,19 @@
<pluginManagement>
<plugins>
- <!-- upgrade from 1.8.0 in ASF parent -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
<!-- 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>
- <!-- upgrade from 3.0.1 in ASF parent -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.2.0</version>
<!-- this affects both direct invocation and execution in the context of site building (https://maven.apache.org/shared/maven-reporting-exec/) -->
<configuration>
<stylesheet>maven</stylesheet>
<excludePackageNames>*.impl:*.internal:${site.javadoc.exclude}</excludePackageNames>
- <!-- suppress timestamp for reproducible builds (https://issues.apache.org/jira/browse/MPOM-260) -->
- <notimestamp>true</notimestamp>
</configuration>
</plugin>
<plugin>
@@ -299,12 +282,6 @@
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
</configuration>
</plugin>
- <!-- upgrade from 1.6 in ASF parent -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
<!-- only overwrite config for surefire/failsafe -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -367,54 +344,6 @@
<profiles>
<profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <!-- generate additional sha512 checksums for some attached artifacts (not supported by ASF parent pom yet, https://issues.apache.org/jira/browse/MPOM-244) -->
- <plugin>
- <groupId>net.nicoulaj.maven.plugins</groupId>
- <artifactId>checksum-maven-plugin</artifactId>
- <version>1.10</version>
- <executions>
- <execution>
- <id>source-release-attached-checksum</id>
- <goals>
- <goal>artifacts</goal>
- </goals>
- <!-- make sure this is executed prior maven-gpg-plugin:sign -->
- <phase>post-integration-test</phase>
- <configuration>
- <algorithms>
- <algorithm>SHA-512</algorithm>
- </algorithms>
- <!-- make sure to attach to also upload to staging repo (https://issues.apache.org/jira/browse/INFRA-14923) -->
- <attachChecksums>true</attachChecksums>
- <!-- generate additional SHA-512-checksums for source-release artifact -->
- <includeClassifiers>source-release</includeClassifiers>
- <excludeMainArtifact>true</excludeMainArtifact>
- </configuration>
- </execution>
- <!-- disable execution from asf parent -->
- <execution>
- <id>source-release-checksum</id>
- <phase>invalid</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!-- execute signing after sha-512 checksum attachment-->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-release-artifacts</id>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>jacoco-report</id>
<build>
<plugins>
@@ -930,6 +859,18 @@
</execution>
</executions>
</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>
</pluginManagement>
</build>