From 39c902f023ba4356a5bc9fd525dacf23b977eb04 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Mon, 2 Dec 2019 13:57:23 +0100
Subject: Use JDK8 as build target for security-utils

---
 security-utils/pom.xml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'security-utils/pom.xml')

diff --git a/security-utils/pom.xml b/security-utils/pom.xml
index 10dec598915..4796a809293 100644
--- a/security-utils/pom.xml
+++ b/security-utils/pom.xml
@@ -11,6 +11,13 @@
   <artifactId>security-utils</artifactId>
   <packaging>container-plugin</packaging>
   <version>7-SNAPSHOT</version>
+
+  <properties>
+    <!-- vespa-http-client targets jdk8 and uses this library -->
+    <!-- TODO remove once vespa-http-client no longer builds against jdk8 -->
+    <maven.compiler.release>8</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <!-- provided -->
     <dependency>
@@ -19,6 +26,13 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <!-- required for bundle-plugin to generate import-package statements for Java's standard library -->
+      <groupId>com.yahoo.vespa</groupId>
+      <artifactId>jdisc_core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- compile scope -->
     <dependency>
@@ -67,6 +81,23 @@
         <artifactId>bundle-plugin</artifactId>
         <extensions>true</extensions>
       </plugin>
+      <plugin>
+        <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>
+          <showDeprecation>true</showDeprecation>
+          <compilerArgs>
+            <arg>-Xlint:all</arg>
+            <arg>-Xlint:-serial</arg>
+            <arg>-Werror</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
-- 
cgit v1.2.3