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-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new 56c40f0 Allow compilation with Java 14
56c40f0 is described below
commit 56c40f03821ab2e3ccdf602baed532c5238eea11
Author: Sebb <s...@apache.org>
AuthorDate: Sun Aug 16 15:42:37 2020 +0100
Allow compilation with Java 14
---
pom.xml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index ede52b7..f40c30e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,8 +109,9 @@
supported Tomcat version is Tomcat 7 which has a minimum Java version
of Java 6. It is therefore advisable to check with the Apache Tomcat
community before increasing these values. -->
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <commons.daemon.javaversion>1.6</commons.daemon.javaversion>
+
<maven.compiler.source>${commons.daemon.javaversion}</maven.compiler.source>
+
<maven.compiler.target>${commons.daemon.javaversion}</maven.compiler.target>
<commons.componentid>daemon</commons.componentid>
<commons.module.name>org.apache.commons.daemon</commons.module.name>
<commons.release.version>1.2.3</commons.release.version>
@@ -156,4 +157,15 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>jdk12-plus-no-java6</id>
+ <activation>
+ <jdk>[1.12,)</jdk>
+ </activation>
+ <properties>
+ <commons.daemon.javaversion>1.7</commons.daemon.javaversion>
+ </properties>
+ </profile>
+ </profiles>
</project>
