Build and run with Java 11

Change-Id: I613d60c7eaaa02a59783d0a237759172171eb546
Issue-ID: ACUMOS-3334
Signed-off-by: Andrew Gauld <agauld@att.com>

diff --git a/acumos-fgw-client/pom.xml b/acumos-fgw-client/pom.xml
index c8ff40d..b9802cf 100644 (file)
--- a/acumos-fgw-client/pom.xml
+++ b/acumos-fgw-client/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
        <name>Federation Gateway Client</name>
        <properties>
                <!-- dependency versions -->
-               <common-dataservice.version>2.2.2</common-dataservice.version>
+               <common-dataservice.version>2.2.6</common-dataservice.version>
        </properties>
        <!-- Dependency/plugin versions are inherited from parent pom -->
        <dependencies>

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index cd51982..515197f 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -23,8 +23,12 @@ Federation Gateway Release Notes
 This server is available as a Docker image in a Docker registry at the Linux Foundation.
 The image name is "federation-gateway" and the tag is a version string as shown below.
 
-Version 2.3.0, 2019-07-22
+Version 2.3.0, 2019-08-09
 -------------------------
+* Java code upgrade to Java 11 (`ACUMOS-3334 <https://jira.acumos.org/browse/ACUMOS-33334>`_)
+
+* Update to CDS 2.2.6
+
 * Fix DI artifact create fail due to Federation use of a stale TCP stream (`ACUMOS-3193 <https://jira.acumos.org/browse/ACUMOS-3193>`_)
 
 * Federated model DI name to include model name - same as source peer DI name (`ACUMOS-3195 <https://jira.acumos.org/browse/ACUMOS-3195>`_)

diff --git a/gateway/pom.xml b/gateway/pom.xml
index f46bc4a..013e63b 100644 (file)
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -169,7 +169,7 @@
                                                <image>
                                                        <name>federation-gateway:${project.version}</name>
                                                        <build>
-                                                               <from>openjdk:8-jre-slim</from>
+                                                               <from>adoptopenjdk/openjdk11-openj9:alpine-jre</from>
                                                                <tags>
                                                                        <tag>${project.version}-b${build.number}</tag>
                                                                </tags>

diff --git a/pom.xml b/pom.xml
index 89d062a..e043c10 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,8 @@ limitations under the License.
                <jacoco.version>0.8.4</jacoco.version>
                <lombok-plugin.version>1.18.6.0</lombok-plugin.version>
                <spring-test.version>5.1.2.RELEASE</spring-test.version>
+               <maven.compiler.source>11</maven.compiler.source>
+               <maven.compiler.target>11</maven.compiler.target>
        </properties>
        <modules>
                <module>acumos-fgw-client-config</module>
@@ -91,14 +93,6 @@ limitations under the License.
                                                </execution>
                                        </executions>
                                </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <configuration>
-                                               <source>1.8</source>
-                                               <target>1.8</target>
-                                       </configuration>
-                               </plugin>
                                <plugin>
                                        <groupId>org.jacoco</groupId>
                                        <artifactId>jacoco-maven-plugin</artifactId>