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/27 10:29:26 UTC
[sling-parent] branch master updated: SLING-10673 set property
maven.compiler.source or maven.compiler.release (#18)
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 c00e79c SLING-10673 set property maven.compiler.source or maven.compiler.release (#18)
c00e79c is described below
commit c00e79cd83d642c5b0d579548b7ddf895b546bb3
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jul 27 12:29:16 2021 +0200
SLING-10673 set property maven.compiler.source or maven.compiler.release (#18)
This configures m-compiler-p and m-javadoc-p
---
sling-parent/pom.xml | 36 ++++++++++++------------------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index 443df42..2c48437 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -260,7 +260,6 @@
<!-- 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>
- <source>${sling.java.version}</source>
</configuration>
</plugin>
<plugin>
@@ -457,17 +456,14 @@
<activation>
<jdk>1.8</jdk>
</activation>
+ <properties>
+ <!-- this affects m-compiler-p and m-javadoc-p -->
+ <maven.compiler.source>${sling.java.version}</maven.compiler.source>
+ <maven.compiler.target>${sling.java.version}</maven.compiler.target>
+ </properties>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.20</version>
@@ -495,21 +491,13 @@
<!-- syntax according to http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html -->
<jdk>[9,)</jdk>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!--
- release sets API classpath, source and target, see
- https://docs.oracle.com/javase/9/tools/javac.htm#GUID-AEEC9F07-CB49-4E96-8BC7-BCC2C7F725C9__GUID-D343F6B4-3FDD-43A8-AD24-43DD70214471
- and http://openjdk.java.net/jeps/247 -->
- <release>${sling.java.version}</release>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <!--
+ release sets API classpath, source and target, see
+ https://docs.oracle.com/javase/9/tools/javac.htm#GUID-AEEC9F07-CB49-4E96-8BC7-BCC2C7F725C9__GUID-D343F6B4-3FDD-43A8-AD24-43DD70214471
+ and http://openjdk.java.net/jeps/247, this affects m-compiler-p and m-javadoc-p -->
+ <maven.compiler.release>${sling.java.version}</maven.compiler.release>
+ </properties>
</profile>
<!-- This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
<profile>