1
0

Allow compilation by Java 12+

This commit is contained in:
Sebb
2020-08-16 16:24:59 +01:00
parent 15f3bbd91e
commit 5c7dfdc7e2

22
pom.xml
View File

@@ -26,7 +26,7 @@ under the License.
<parent> <parent>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId> <artifactId>commons-parent</artifactId>
<version>34</version> <version>52</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
@@ -530,8 +530,10 @@ under the License.
</distributionManagement> </distributionManagement>
<properties> <properties>
<maven.compiler.source>1.6</maven.compiler.source> <animal-sniffer.signature>java16</animal-sniffer.signature>
<maven.compiler.target>1.6</maven.compiler.target> <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.componentid>logging</commons.componentid>
<commons.module.name>org.apache.commons.logging</commons.module.name> <commons.module.name>org.apache.commons.logging</commons.module.name>
<commons.release.version>1.2</commons.release.version> <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 org.apache.log4j;version="[1.2.15, 2.0.0)";resolution:=optional
</commons.osgi.import> </commons.osgi.import>
</properties> </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> </project>