diff options
author | gjoranv <gv@verizonmedia.com> | 2021-11-15 13:02:06 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-11-15 13:10:14 +0100 |
commit | 3b4972e15911ca5d106b5cd952aeeedd8411ce6a (patch) | |
tree | be0058663a18e31ca35108ca9819460e855e5989 /client/pom.xml | |
parent | 3db0193e1998ef5ed3f176c4f46cc4c4c08f9000 (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 'client/pom.xml')
-rw-r--r-- | client/pom.xml | 13 |
1 files changed, 7 insertions, 6 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> |