diff options
author | Jon Bratseth <bratseth@oath.com> | 2019-10-22 22:51:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-22 22:51:16 +0200 |
commit | 5129c936bd24bf2123372c4b2245ed836101cde1 (patch) | |
tree | 18ae7d7132e661fc54b7148a5f0d8a2d76960b94 | |
parent | 2433a37c22b225195873efa0c08897c18133f63f (diff) | |
parent | df0f229fdd18c92bfbb94678d27e681fb1c98ca8 (diff) |
Merge pull request #11050 from vespa-engine/aressem/compile-for-java-8
Use the new release option in JDK 9+ to ensure JDK 8 compability for …
-rw-r--r-- | vespa-hadoop/pom.xml | 2 | ||||
-rw-r--r-- | vespa-http-client/pom.xml | 26 |
2 files changed, 6 insertions, 22 deletions
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index ff21404a2c7..7e1a8d832b2 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -19,6 +19,8 @@ <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> <!-- This is a client jar and should be compilable with jdk8 --> diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index b17a4708538..bdac1d660dc 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -14,28 +14,10 @@ <name>${project.artifactId}</name> <description>Independent external feeding API towards Vespa.</description> - <!-- This is a client jar and should be compilable with jdk8 --> - <profiles> - <profile> - <id>jdk11</id> - <activation> - <jdk>11</jdk> - </activation> - <properties> - <java.version>11</java.version> - </properties> - </profile> - <profile> - <id>jdk1.8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <properties> - <java.version>8</java.version> - </properties> - </profile> - </profiles> - + <properties> + <!-- This is a client jar and should be compilable with jdk8 --> + <maven.compiler.release>8</maven.compiler.release> + </properties> <dependencies> |