EPBDS-12356 Remove Java 8 support. The minimal Java version is 11. Tr…

…y Java 17
openl-tablets · Dec 6, 2021 · 76b2b4e · 76b2b4e
1 parent ef4c8c3
commit 76b2b4e
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 59 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
-        java: [ 8, 11, 15 ]
+        java: [ 11, 17 ]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     name: ${{ matrix.os }}/java-${{ matrix.java }}

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -18,10 +18,10 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - name: Setup Java 8
+    - name: Setup Java 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     - name: Set environment variables
       run: |

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -30,7 +30,7 @@ jobs:
 
     - uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
 
     - name: Set environment variables
       run: |

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -49,16 +49,16 @@ jobs:
         echo $latest
         echo $latestMajor
         tags_11="-t openltablets/\$appName:$version"
-        tags_8="-t openltablets/\$appName:$version-jre8"
+        tags_17="-t openltablets/\$appName:$version-jre17"
         if [ "$latestMajor" = "$version" ]; then
           tags_11+=" -t openltablets/\$appName:$major.x"
-          tags_8+=" -t openltablets/\$appName:$major.x-jre8"
+          tags_17+=" -t openltablets/\$appName:$major.x-jre17"
         fi
         if [ "$latest" = "$version" ]; then
           tags_11+=" -t openltablets/\$appName:latest"
         fi
         echo "tags_11=$tags_11" >> $GITHUB_ENV
-        echo "tags_8=$tags_8" >> $GITHUB_ENV
+        echo "tags_17=$tags_17" >> $GITHUB_ENV
         echo "version=$version" >> $GITHUB_ENV
 
     - name: Download WebStudio
@@ -122,29 +122,13 @@ jobs:
         eval docker build $tags_11
         -f ./Dockerfiles/Demo .
 
-    - name: Rule Services (All) JDK 8
-      run: >
-        docker build -t openltablets/ws:$version-jre8-all
-        --build-arg APP=webservice-all
-        --build-arg JDK=$JAVA8
-        -f ./Dockerfiles/WebApp .
-
     - name: Rule Services (All) JDK 11
       run: >
         docker build -t openltablets/ws:$version-all
         --build-arg APP=webservice-all
         --build-arg JDK=$JAVA11
         -f ./Dockerfiles/WebApp .
 
-    - name: Rule Services JDK 8
-      env:
-        appName : ws
-      run: >
-        eval docker build $tags_8
-        --build-arg APP=webservice
-        --build-arg JDK=$JAVA8
-        -f ./Dockerfiles/WebApp .
-
     - name: Rule Services JDK 11
       env:
         appName : ws
@@ -154,15 +138,6 @@ jobs:
         --build-arg JDK=$JAVA11
         -f ./Dockerfiles/WebApp .
 
-    - name: WebStudio JDK 8
-      env:
-        appName : webstudio
-      run: >
-        eval docker build $tags_8
-        --build-arg APP=webstudio
-        --build-arg JDK=$JAVA8
-        -f ./Dockerfiles/WebApp .
-
     - name: WebStudio JDK 11
       env:
         appName : webstudio

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Setup Java & Maven settings
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD

diff --git a/ITEST/itest.storelogdata/pom.xml b/ITEST/itest.storelogdata/pom.xml
@@ -25,8 +25,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>${java.source.version}</source>
-                    <target>${java.target.version}</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>com.datastax.oss</groupId>

diff --git a/README.md b/README.md
@@ -21,18 +21,22 @@ All of OpenL Tablets is open sourced under **LGPL** license.
 
 #### Requirements:
 
-* JDK 8
-* Maven 3.8.1
+* JDK 11
+* Maven 3.8.3
 * 512 MiB RAM free
 * 2 GiB Disk space free
 
-#### Build command:
+#### Build Maven artifacts:
 
 `mvn`
 
-Estimated build time: ~15 minutes
+Estimated build time: ~25 minutes
 
-#### Build artifacts:
-* **WebStudio** - STUDIO\org.openl.rules.webstudio\target\*.war
-* **RuleService WS** - WSFrontend\org.openl.rules.ruleservice.ws\target\*.war
-* **DEMO App** - DEMO\org.openl.rules.demo\target\*.zip
+Artifacts:
+* **WebStudio** - STUDIO\org.openl.rules.webstudio\target\webapp.war
+* **RuleService WS** - WSFrontend\org.openl.rules.ruleservice.ws\target\webapp.war
+* **DEMO App** - DEMO\org.openl.rules.demo\target\openl-tablets-demo.zip
+
+#### Build Docker images:
+
+`docker-compose -f Dockerfiles\docker-compose.yaml build`
diff --git a/Util/openl-maven-plugin/it/openl-multimodule/pom.xml b/Util/openl-maven-plugin/it/openl-multimodule/pom.xml
@@ -17,10 +17,9 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
+                    <version>3.8.1</version>
                     <configuration>
-                        <source>@java.source.version@</source>
-                        <target>@java.target.version@</target>
+                        <release>11</release>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/Util/openl-maven-plugin/it/openl-verify-provided-dependency/pom.xml b/Util/openl-maven-plugin/it/openl-verify-provided-dependency/pom.xml
@@ -17,6 +17,14 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                    <configuration>
+                        <release>11</release>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.openl.rules</groupId>
                     <artifactId>openl-maven-plugin</artifactId>

diff --git a/Util/openl-maven-plugin/pom.xml b/Util/openl-maven-plugin/pom.xml
@@ -159,8 +159,7 @@
                             <streamLogs>true</streamLogs>
                             <useLocalRepository>true</useLocalRepository>
                             <properties>
-                                <maven.compiler.source>${java.source.version}</maven.compiler.source>
-                                <maven.compiler.target>${java.target.version}</maven.compiler.target>
+                                <maven.compiler.release>11</maven.compiler.release>
                             </properties>
                             <showErrors>true</showErrors>
                             <!-- Estimated test's time should not take more than 10 sec on 4х CPU (2GHz) -->

diff --git a/Util/openl-simple-project-archetype/resources/archetype-resources/pom.xml b/Util/openl-simple-project-archetype/resources/archetype-resources/pom.xml
@@ -17,8 +17,6 @@
     </organization>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.source.version>${java.source.version}</java.source.version>
-        <java.target.version>${java.target.version}</java.target.version>
         <org.openl.version>${project.version}</org.openl.version>
     </properties>
     <dependencies>
@@ -64,10 +62,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>${symbol_dollar}{java.source.version}</source>
-                    <target>${symbol_dollar}{java.target.version}</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/WSFrontend/org.openl.rules.ruleservice.ws.storelogdata.cassandra/pom.xml b/WSFrontend/org.openl.rules.ruleservice.ws.storelogdata.cassandra/pom.xml
@@ -17,8 +17,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>${java.source.version}</source>
-					<target>${java.target.version}</target>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>com.datastax.oss</groupId>

diff --git a/pom.xml b/pom.xml
@@ -73,8 +73,6 @@
     </scm>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.target.version>1.8</java.target.version>
-        <java.source.version>1.8</java.source.version>
         <!-- If true, deploying of artifacts will be skipped  -->
         <maven.deploy.skip>false</maven.deploy.skip>
         <maven.install.skip>${maven.deploy.skip}</maven.install.skip>
@@ -223,8 +221,7 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.1</version>
                     <configuration>
-                        <source>${java.source.version}</source>
-                        <target>${java.target.version}</target>
+                        <release>11</release>
                     </configuration>
                 </plugin>
                 <plugin>