Skip to content

Commit 1f5e86c

Browse files
authored
Avoid unnecessary defining and clearing of properties (#249)
1 parent 0a525b6 commit 1f5e86c

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

pom.xml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@
8686
<!-- By default only check remote repositories once per week -->
8787
<maven.repository.update.freqency>interval:10080</maven.repository.update.freqency>
8888

89-
<maven.compiler.source>1.8</maven.compiler.source>
90-
<maven.compiler.target>1.8</maven.compiler.target>
91-
<maven.compiler.testSource>1.8</maven.compiler.testSource>
92-
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
9389
<!-- Generate metadata for reflection on method parameters -->
9490
<maven.compiler.parameters>true</maven.compiler.parameters>
9591

@@ -839,21 +835,28 @@
839835

840836
<profiles>
841837
<profile>
842-
<id>jdk-above-9</id>
838+
<id>jdk-8-and-below</id>
843839
<activation>
844-
<jdk>[1.9,)</jdk>
840+
<jdk>(,1.8]</jdk>
841+
</activation>
842+
<properties>
843+
<maven.compiler.source>1.8</maven.compiler.source>
844+
<maven.compiler.target>1.8</maven.compiler.target>
845+
<maven.compiler.testSource>1.8</maven.compiler.testSource>
846+
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
847+
</properties>
848+
</profile>
849+
<profile>
850+
<id>jdk-9-and-above</id>
851+
<activation>
852+
<jdk>[9,)</jdk>
845853
</activation>
846854
<properties>
847855
<!-- When compiling with a Java 9+ compiler, we always rely on "release" in favor of "source" and "target", even when compiling to Java 8 bytecode. -->
848856
<maven.compiler.release>8</maven.compiler.release>
849857
<maven.compiler.testRelease>8</maven.compiler.testRelease>
850858
<!-- "release" serves the same purpose as Animal Sniffer. -->
851859
<animal.sniffer.skip>true</animal.sniffer.skip>
852-
<!-- While it does not hurt to have these set to the Java specification version, it is also not needed when "release" is in use. -->
853-
<maven.compiler.source combine.self="override" />
854-
<maven.compiler.target combine.self="override" />
855-
<maven.compiler.testSource combine.self="override" />
856-
<maven.compiler.testTarget combine.self="override" />
857860
<!-- Work around openjdk/jdk11u-dev#919. TODO When we upgrade to OpenJDK 11.0.16, this should be deleted. -->
858861
<maven.compiler.forceJavacCompilerUse>true</maven.compiler.forceJavacCompilerUse>
859862
</properties>

0 commit comments

Comments
 (0)