[commons-logging] branch master updated: Allow compilation by Java 12+

[se...@apache.org]

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

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c7dfdc  Allow compilation by Java 12+
5c7dfdc is described below

commit 5c7dfdc7e2e4f0915936abc251eafd183ca95b23
Author: Sebb <se...@apache.org>
AuthorDate: Sun Aug 16 16:24:59 2020 +0100

    Allow compilation by Java 12+
---
 pom.xml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d8a146..c62d4c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>34</version>
+    <version>52</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>commons-logging</groupId>
@@ -530,8 +530,10 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <maven.compiler.source>1.6</maven.compiler.source>
-    <maven.compiler.target>1.6</maven.compiler.target>
+    <animal-sniffer.signature>java16</animal-sniffer.signature>
+    <commons.logging.javaversion>1.6</commons.logging.javaversion>
+    <maven.compiler.source>${commons.logging.javaversion}</maven.compiler.source>
+    <maven.compiler.target>${commons.logging.javaversion}</maven.compiler.target>
     <commons.componentid>logging</commons.componentid>
     <commons.module.name>org.apache.commons.logging</commons.module.name>
     <commons.release.version>1.2</commons.release.version>
@@ -551,4 +553,18 @@ under the License.
       org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional
     </commons.osgi.import>
   </properties>
+
+  <profiles>
+    <profile>
+      <!-- Bump the minimum compiler version for JDK 12+ -->
+      <id>jdk12-plus-no-java6</id>
+      <activation>
+        <jdk>[1.12,)</jdk>
+      </activation>
+      <properties>
+        <commons.logging.javaversion>1.7</commons.logging.javaversion>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>