Client-side modules should be compilable with jdk8

6 files changed, 91 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
index dc04aa54ba0..ee61b34987a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/FileStatusHandlerComponent.java
@@ -6,6 +6,7 @@ import com.yahoo.osgi.provider.model.ComponentModel;
 
 /**
  * Sets up VipStatusHandler that answers OK when a certain file is present.
+ *
  * @author Tony Vaagenes
  */
 public class FileStatusHandlerComponent extends Handler implements VipStatusConfig.Producer {
diff --git a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
index 8d50f4a14dd..7b78f90bc56 100644
--- a/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
+++ b/document/src/main/java/com/yahoo/document/json/DocumentUpdateJsonSerializer.java
@@ -65,8 +65,8 @@ import static com.yahoo.document.json.JsonSerializationHelper.*;
  * @see #serialize(com.yahoo.document.DocumentUpdate)
  * @author Vegard Sjonfjell
  */
-public class DocumentUpdateJsonSerializer
-{
+public class DocumentUpdateJsonSerializer {
+
     private final JsonFactory jsonFactory = new JsonFactory();
     private final JsonDocumentUpdateWriter writer = new JsonDocumentUpdateWriter();
     private JsonGenerator generator;
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml
index 2f8dbb46a78..31ef78bfeb4 100644
--- a/vespa-hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
@@ -21,6 +21,27 @@
         <pig.version>0.14.0</pig.version>
     </properties>
 
+    <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>
+
     <dependencies>
         <!-- Hadoop dependencies -->
         <dependency>
@@ -145,8 +166,28 @@
             </plugin>
 
             <plugin>
-                <groupId>com.yahoo.vespa</groupId>
-                <artifactId>abi-check-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+                <configuration>
+                    <jdkToolchain>
+                        <version>${java.version}</version>
+                    </jdkToolchain>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <showWarnings>true</showWarnings>
+                    <optimize>true</optimize>
+                    <showDeprecation>false</showDeprecation>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                        <arg>-Xlint:-serial</arg>
+                        <arg>-Xlint:-try</arg>
+                        <arg>-Xlint:-processing</arg>
+                        <arg>-Xlint:-varargs</arg>
+                        <arg>-Xlint:-options</arg>
+                        <arg>-Werror</arg>
+                    </compilerArgs>
+                </configuration>
             </plugin>
         </plugins>
 
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml
index b42c4c32a08..bcb761b2dbb 100644
--- a/vespa-http-client/pom.xml
+++ b/vespa-http-client/pom.xml
@@ -14,6 +14,28 @@
   <name>${project.artifactId}</name>
   <description>Independent external feeding API towards Vespa.</description>
 
+  <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>
+
+
   <dependencies>
 
     <!-- NOTE: Adding dependencies here may break clients because this is used outside an OSGi container with
@@ -135,8 +157,28 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>abi-check-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <jdkToolchain>
+            <version>${java.version}</version>
+          </jdkToolchain>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <showWarnings>true</showWarnings>
+          <optimize>true</optimize>
+          <showDeprecation>false</showDeprecation>
+          <compilerArgs>
+            <arg>-Xlint:all</arg>
+            <arg>-Xlint:-serial</arg>
+            <arg>-Xlint:-try</arg>
+            <arg>-Xlint:-processing</arg>
+            <arg>-Xlint:-varargs</arg>
+            <arg>-Xlint:-options</arg>
+            <arg>-Werror</arg>
+          </compilerArgs>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
index 4468355698f..f9357ab16d8 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/communication/ApacheGatewayConnection.java
@@ -412,7 +412,7 @@ class ApacheGatewayConnection implements GatewayConnection {
 
             }
             clientBuilder.setUserAgent(String.format("vespa-http-client (%s)", Vtag.currentVersion));
-            clientBuilder.setDefaultHeaders(List.of(new BasicHeader(Headers.CLIENT_VERSION, Vtag.currentVersion)));
+            clientBuilder.setDefaultHeaders(Collections.singletonList(new BasicHeader(Headers.CLIENT_VERSION, Vtag.currentVersion)));
             clientBuilder.setMaxConnPerRoute(1);
             clientBuilder.setMaxConnTotal(1);
             clientBuilder.disableContentCompression();
diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
index ec80dd53a4b..53715259a0c 100644
--- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
+++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java
@@ -7,11 +7,8 @@ import com.yahoo.vespa.http.client.config.SessionParams;
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;