From f963d8bdcf962b74573fe795a5180e300f60ce00 Mon Sep 17 00:00:00 2001
From: Derry Hamilton <derryh@rasilon.net>
Date: Thu, 2 Jul 2020 09:23:41 +0100
Subject: [PATCH] Update to Java 11

---
 docker/multistage/Dockerfile | 8 +++++---
 pom.xml                      | 7 +++----
 uJETL.spec                   | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker/multistage/Dockerfile b/docker/multistage/Dockerfile
index 7caed0c..abe551d 100644
--- a/docker/multistage/Dockerfile
+++ b/docker/multistage/Dockerfile
@@ -1,14 +1,16 @@
-FROM centos:centos7 as builder
+FROM centos:centos8 as builder
 RUN yum -y install epel-release java-11-openjdk-devel
 RUN yum -y groupinstall 'Development Tools'
 RUN yum -y install git maven
+RUN alternatives --set javac /usr/lib/jvm/java-11-openjdk-11.0.7.10-1.el8_1.x86_64/bin/javac
+RUN alternatives --set java /usr/lib/jvm/java-11-openjdk-11.0.7.10-1.el8_1.x86_64/bin/java
 RUN git clone --single-branch --branch dev https://github.com/rasilon/ujetl.git
-RUN cd ujetl && mvn -e package
+RUN cd ujetl && JAVA_HOME=/usr/lib/jvm/java-11 mvn -e package
 
 
 
 
-FROM openjdk:8-alpine as runner
+FROM openjdk:11-alpine as runner
 LABEL maintainer="Derry Hamilton <derryh@rasilon.net>"
 
 RUN apk update && apk upgrade && apk add bash
diff --git a/pom.xml b/pom.xml
index d939941..d6cd5a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
   <groupId>com.rasilon.ujetl</groupId>
   <artifactId>CopyingApp</artifactId>
   <packaging>jar</packaging>
-  <version>2.2.4</version>
+  <version>2.3.0</version>
   <name>uJETL</name>
   <url>https://github.com/rasilon/ujetl</url>
   <properties>
@@ -83,10 +83,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.8.0</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <release>11</release>
         </configuration>
       </plugin>
       <plugin>
diff --git a/uJETL.spec b/uJETL.spec
index a61d476..dc3e172 100644
--- a/uJETL.spec
+++ b/uJETL.spec
@@ -1,6 +1,6 @@
 Summary: Java app to facilitate moving data between databases.
 Name: uJETL
-Version: 2.2.4
+Version: 2.3.0
 Release: 1
 Group: Applications/Database
 License: All rights reserved.