Avoid unnecessary defining and clearing of properties (#249)

jenkinsci · Apr 2, 2022 · 1f5e86c · 1f5e86c
1 parent 0a525b6
commit 1f5e86c
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,10 +86,6 @@
     <!-- By default only check remote repositories once per week -->
     <maven.repository.update.freqency>interval:10080</maven.repository.update.freqency>
 
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.testSource>1.8</maven.compiler.testSource>
-    <maven.compiler.testTarget>1.8</maven.compiler.testTarget>
     <!-- Generate metadata for reflection on method parameters -->
     <maven.compiler.parameters>true</maven.compiler.parameters>
 
@@ -839,21 +835,28 @@
 
   <profiles>
     <profile>
-      <id>jdk-above-9</id>
+      <id>jdk-8-and-below</id>
       <activation>
-        <jdk>[1.9,)</jdk>
+        <jdk>(,1.8]</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.testSource>1.8</maven.compiler.testSource>
+        <maven.compiler.testTarget>1.8</maven.compiler.testTarget>
+      </properties>
+    </profile>
+    <profile>
+      <id>jdk-9-and-above</id>
+      <activation>
+        <jdk>[9,)</jdk>
       </activation>
       <properties>
         <!-- 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. -->
         <maven.compiler.release>8</maven.compiler.release>
         <maven.compiler.testRelease>8</maven.compiler.testRelease>
         <!-- "release" serves the same purpose as Animal Sniffer. -->
         <animal.sniffer.skip>true</animal.sniffer.skip>
-        <!-- While it does not hurt to have these set to the Java specification version, it is also not needed when "release" is in use. -->
-        <maven.compiler.source combine.self="override" />
-        <maven.compiler.target combine.self="override" />
-        <maven.compiler.testSource combine.self="override" />
-        <maven.compiler.testTarget combine.self="override" />
         <!-- Work around openjdk/jdk11u-dev#919. TODO When we upgrade to OpenJDK 11.0.16, this should be deleted. -->
         <maven.compiler.forceJavacCompilerUse>true</maven.compiler.forceJavacCompilerUse>
       </properties>