From df383ab3434cc06ff41825320f7ea22f72f5f35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Sultan?= <remi.sultan@gmail.com>
Date: Wed, 25 Aug 2021 17:16:09 +0200
Subject: [PATCH] feat: bump project to jdk16  (#68)

* feat: setting project to JDK16 for better compatibility

* fix: master build would not commit sub pom.xml

* feat: setting jdk16 to github action builds
---
 .github/workflows/compile-and-test.yml | 2 +-
 .github/workflows/master-deploy.yml    | 6 +++---
 README.md                              | 2 +-
 java-ml-example/pom.xml                | 6 +++---
 java-ml/pom.xml                        | 4 ++--
 pom.xml                                | 4 +---
 version.properties                     | 2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/compile-and-test.yml b/.github/workflows/compile-and-test.yml
index dc6f6bd..83decc0 100644
--- a/.github/workflows/compile-and-test.yml
+++ b/.github/workflows/compile-and-test.yml
@@ -12,5 +12,5 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: '15'
+          java-version: '16'
       - run: ./mvnw clean test
diff --git a/.github/workflows/master-deploy.yml b/.github/workflows/master-deploy.yml
index 46ceb9a..1766ce8 100644
--- a/.github/workflows/master-deploy.yml
+++ b/.github/workflows/master-deploy.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: '15'
+          java-version: '16'
       - name: Master Compile
         run: |
           #Add maven settings.xml
@@ -34,7 +34,7 @@ jobs:
           # Setting the Release version to pom
           app_version=$(grep -rE "version.next=[0-9]+\.[0-9]+\.[0-9]+" version.properties | cut -d"=" -f2)
           ./set-version.sh release
-          git add pom.xml pom.xml version.properties
+          git add pom.xml */pom.xml version.properties
           git commit -m "release: v-$app_version"
           git tag -a -m "$app_version" "$app_version"
 
@@ -45,7 +45,7 @@ jobs:
 
           # Setting the next developement iteration
           ./set-version.sh snapshot
-          git add pom.xml version.properties
+          git add pom.xml */pom.xml version.properties
           git commit -m "chore: jumping onto next development iteration"
       - name: Push changes made
         uses: ad-m/github-push-action@master
diff --git a/README.md b/README.md
index 8fd11fa..856af8a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ You can check for examples in this package: ``src/main/java/org/rsultan/example`
 
 ## Requirements
 
-- JDK15+
+- JDK16+
 
 ## Getting started
 
diff --git a/java-ml-example/pom.xml b/java-ml-example/pom.xml
index bd24f5f..5da4506 100644
--- a/java-ml-example/pom.xml
+++ b/java-ml-example/pom.xml
@@ -6,18 +6,18 @@
   <parent>
     <artifactId>java-ml-parent</artifactId>
     <groupId>org.rsultan</groupId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>java-ml-example</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.1-SNAPSHOT</version>
   <name>java-ml-example</name>
 
   <dependencies>
     <dependency>
       <groupId>org.rsultan</groupId>
       <artifactId>java-ml</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
diff --git a/java-ml/pom.xml b/java-ml/pom.xml
index e45202d..5a3d9f9 100644
--- a/java-ml/pom.xml
+++ b/java-ml/pom.xml
@@ -8,11 +8,11 @@
   <parent>
     <groupId>org.rsultan</groupId>
     <artifactId>java-ml-parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
 
   <name>java-ml</name>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.1-SNAPSHOT</version>
   <artifactId>java-ml</artifactId>
 
   <properties>
diff --git a/pom.xml b/pom.xml
index 8f395d2..52fe4b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <properties>
     <assertj-core.version>3.9.1</assertj-core.version>
     <google-storage-wagon.version>1.0</google-storage-wagon.version>
-    <java.version>15</java.version>
+    <java.version>16</java.version>
     <junit-jupiter.version>5.7.0</junit-jupiter.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -89,7 +89,6 @@
               <BACKEND_PRIORITY_CPU>1</BACKEND_PRIORITY_CPU>
               <BACKEND_PRIORITY_GPU>0</BACKEND_PRIORITY_GPU>
             </environmentVariables>
-            <argLine>--enable-preview</argLine>
           </configuration>
         </plugin>
         <plugin>
@@ -121,7 +120,6 @@
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
-          <compilerArgs>--enable-preview</compilerArgs>
         </configuration>
       </plugin>
     </plugins>
diff --git a/version.properties b/version.properties
index 1215222..825b4cf 100755
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-version.next=1.4.1
+version.next=2.0.0