aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-hadoop
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-11-15 13:02:06 +0100
committergjoranv <gv@verizonmedia.com>2021-11-15 13:10:14 +0100
commit3b4972e15911ca5d106b5cd952aeeedd8411ce6a (patch)
treebe0058663a18e31ca35108ca9819460e855e5989 /vespa-hadoop
parent3db0193e1998ef5ed3f176c4f46cc4c4c08f9000 (diff)
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.
Diffstat (limited to 'vespa-hadoop')
-rw-r--r--vespa-hadoop/pom.xml7
1 files changed, 1 insertions, 6 deletions
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>