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 06:37:14 UTC

[sling-parent] branch feature/SLING-10673-set-release-or-source created (now 79e8d17)

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a change to branch feature/SLING-10673-set-release-or-source
in repository https://gitbox.apache.org/repos/asf/sling-parent.git.


      at 79e8d17  SLING-10673 set property maven.compiler.source or maven.compiler.release to configure m-compiler-p and m-javadoc-p

This branch includes the following new commits:

     new 79e8d17  SLING-10673 set property maven.compiler.source or maven.compiler.release to configure m-compiler-p and m-javadoc-p

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-10673 set property maven.compiler.source or maven.compiler.release to configure m-compiler-p and m-javadoc-p

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-10673-set-release-or-source
in repository https://gitbox.apache.org/repos/asf/sling-parent.git

commit 79e8d1714a2c0a5a30ab43de06da1f11d050b4f9
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jul 27 08:36:58 2021 +0200

    SLING-10673 set property maven.compiler.source or maven.compiler.release
    to configure 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..35b5044 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>${java.target.version}</maven.compiler.source>
+                <maven.compiler.target>${java.target.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>${java.target.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>