From 3b4972e15911ca5d106b5cd952aeeedd8411ce6a Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Mon, 15 Nov 2021 13:02:06 +0100
Subject: Use a custom property for setting relase version for clients.

- Always set release version via maven-compiler-plugin, instead
  of maven property which is overridden by compiler-plugin config.
- Using a custom property with self-explanatory name makes
  comments redundant.
- Remove explicit jdkToolchain config, as these modules no longer
  compile with jdk pre 9, due to the --release flag.
---
 vespa-feed-client/pom.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'vespa-feed-client')

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>
-- 
cgit v1.2.3