Merge pull request #20013 from vespa-engine/configure-release-version-safely-via-property

Use a custom property for setting relase version for clients.

8 files changed, 14 insertions, 64 deletions

diff --git a/client/pom.xml b/client/pom.xml
index ba153aed8f8..4abcdf9ac6c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -16,12 +16,6 @@
   <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- TODO: Remove when we no longer support JDK 8 clients -->
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -64,6 +58,13 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>${vespaClients.jdk.releaseVersion}</release>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <configuration>
           <finalName>${project.artifactId}-jar-with-dependencies</finalName>
diff --git a/http-utils/pom.xml b/http-utils/pom.xml
index e387e2c59e1..be62b7adb35 100644
--- a/http-utils/pom.xml
+++ b/http-utils/pom.xml
@@ -12,12 +12,6 @@
   <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
 
-  <properties>
-    <!-- vespa-http-client targets jdk8 and uses this library -->
-    <!-- TODO remove once vespa-http-client no longer builds against jdk8 -->
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <!-- provided -->
     <dependency>
@@ -73,11 +67,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <jdkToolchain>
-            <version>${java.version}</version>
-          </jdkToolchain>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
           <compilerArgs>
             <arg>-Xlint:all</arg>
diff --git a/parent/pom.xml b/parent/pom.xml
index aea586f3949..c0ba936d5e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -922,6 +922,7 @@
         <doclint>all</doclint>
         <test.hide>true</test.hide>
 
+        <vespaClients.jdk.releaseVersion>8</vespaClients.jdk.releaseVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index 4e33e31c8c4..b7c7c110ad8 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -12,12 +12,6 @@
   <packaging>bundle</packaging>
   <version>7-SNAPSHOT</version>
 
-  <properties>
-    <!-- vespa-http-client targets jdk8 and uses this library -->
-    <!-- TODO remove once vespa-http-client no longer builds against jdk8 -->
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <!-- provided -->
     <dependency>
@@ -73,11 +67,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <jdkToolchain>
-            <version>${java.version}</version>
-          </jdkToolchain>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
           <compilerArgs>
             <arg>-Xlint:all</arg>
diff --git a/vespa-feed-client-cli/pom.xml b/vespa-feed-client-cli/pom.xml
index 930d31beb6c..aff625fe3a4 100644
--- a/vespa-feed-client-cli/pom.xml
+++ b/vespa-feed-client-cli/pom.xml
@@ -12,11 +12,6 @@
   <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
 
-  <properties>
-    <!-- Used by internal properties that are still using JDK8-->
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <!-- compile scope -->
     <dependency>
@@ -56,11 +51,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <jdkToolchain>
-            <version>${java.version}</version>
-          </jdkToolchain>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
           <compilerArgs>
             <arg>-Xlint:all</arg>
diff --git a/vespa-feed-client/pom.xml b/vespa-feed-client/pom.xml
index cf2da78c4a9..68c9e4b4b7c 100644
--- a/vespa-feed-client/pom.xml
+++ b/vespa-feed-client/pom.xml
@@ -12,11 +12,6 @@
   <packaging>jar</packaging>
   <version>7-SNAPSHOT</version>
 
-  <properties>
-    <!-- Used by internal properties that are still using JDK8-->
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <!-- compile scope -->
     <dependency>
@@ -54,11 +49,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <jdkToolchain>
-            <version>${java.version}</version>
-          </jdkToolchain>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
           <compilerArgs>
             <arg>-Xlint:all</arg>
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml
index 60e3aff01cb..8c65470abea 100644
--- a/vespa-hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
@@ -19,8 +19,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hadoop.version>2.8.0</hadoop.version>
         <pig.version>0.14.0</pig.version>
-        <!-- This is a client jar and should be compilable with jdk8 -->
-        <maven.compiler.release>8</maven.compiler.release>
     </properties>
 
     <dependencies>
@@ -186,10 +184,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <jdkToolchain>
-                        <version>${java.version}</version>
-                    </jdkToolchain>
-                    <release>${maven.compiler.release}</release>
+                    <release>${vespaClients.jdk.releaseVersion}</release>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index fa73dd1bd74..eefb07d4ece 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -14,11 +14,6 @@
   <name>${project.artifactId}</name>
   <description>Independent external feeding API towards Vespa.</description>
 
-  <properties>
-    <!-- This is a client jar and should be compilable with jdk8 -->
-    <maven.compiler.release>8</maven.compiler.release>
-  </properties>
-
   <dependencies>
 
     <!-- NOTE: Adding dependencies here may break clients because this is used outside an OSGi container with
@@ -155,11 +150,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <jdkToolchain>
-            <version>${java.version}</version>
-          </jdkToolchain>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
+          <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
           <compilerArgs>
             <arg>-Xlint:all</arg>