From 76b2b4e75b9b3bc485ffba7cb789b1b78659f942 Mon Sep 17 00:00:00 2001 From: Yury Molchan Date: Wed, 17 Nov 2021 21:26:12 +0300 Subject: [PATCH] EPBDS-12356 Remove Java 8 support. The minimal Java version is 11. Try Java 17 --- .github/workflows/build.yml | 2 +- .github/workflows/check.yml | 4 +-- .github/workflows/deploy.yml | 2 +- .github/workflows/docker.yml | 31 ++----------------- .github/workflows/release.yml | 2 +- ITEST/itest.storelogdata/pom.xml | 2 -- README.md | 20 +++++++----- .../it/openl-multimodule/pom.xml | 5 ++- .../openl-verify-provided-dependency/pom.xml | 8 +++++ Util/openl-maven-plugin/pom.xml | 3 +- .../resources/archetype-resources/pom.xml | 7 ++--- .../pom.xml | 2 -- pom.xml | 5 +-- 13 files changed, 34 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa5ab5afd8c..d7d57d2e329 100644 --- 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 index 4038a3d8717..87c6ff61cc4 100644 --- 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 index d52c6393162..9f0e41a9fac 100644 --- 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 index 2d08bc880e5..987d5ce21e4 100644 --- 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,13 +122,6 @@ 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 @@ -136,15 +129,6 @@ jobs: --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 index aebae87984f..b3c02093569 100644 --- 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 index 2b597ddf29f..0ea9f9bd64d 100644 --- a/ITEST/itest.storelogdata/pom.xml +++ b/ITEST/itest.storelogdata/pom.xml @@ -25,8 +25,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${java.source.version} - ${java.target.version} com.datastax.oss diff --git a/README.md b/README.md index 8fd204670ba..b365cec397f 100644 --- 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 index 7e287865d3e..c50d3fdbd7c 100644 --- a/Util/openl-maven-plugin/it/openl-multimodule/pom.xml +++ b/Util/openl-maven-plugin/it/openl-multimodule/pom.xml @@ -17,10 +17,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.8.1 - @java.source.version@ - @java.target.version@ + 11 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 index 104407424fe..15c4bf2e239 100644 --- 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 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 11 + + org.openl.rules openl-maven-plugin diff --git a/Util/openl-maven-plugin/pom.xml b/Util/openl-maven-plugin/pom.xml index 2753747febd..19cbeb5d7ab 100644 --- a/Util/openl-maven-plugin/pom.xml +++ b/Util/openl-maven-plugin/pom.xml @@ -159,8 +159,7 @@ true true - ${java.source.version} - ${java.target.version} + 11 true diff --git a/Util/openl-simple-project-archetype/resources/archetype-resources/pom.xml b/Util/openl-simple-project-archetype/resources/archetype-resources/pom.xml index 5de4d454cf3..63a81c036d1 100644 --- 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 @@ UTF-8 - ${java.source.version} - ${java.target.version} ${project.version} @@ -64,10 +62,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.8.1 - ${symbol_dollar}{java.source.version} - ${symbol_dollar}{java.target.version} + 11 diff --git a/WSFrontend/org.openl.rules.ruleservice.ws.storelogdata.cassandra/pom.xml b/WSFrontend/org.openl.rules.ruleservice.ws.storelogdata.cassandra/pom.xml index 9df20b38471..be74982a404 100644 --- 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 @@ org.apache.maven.plugins maven-compiler-plugin - ${java.source.version} - ${java.target.version} com.datastax.oss diff --git a/pom.xml b/pom.xml index 91a967d1384..d159688a1b1 100644 --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,6 @@ UTF-8 - 1.8 - 1.8 false ${maven.deploy.skip} @@ -223,8 +221,7 @@ maven-compiler-plugin 3.8.1 - ${java.source.version} - ${java.target.version} + 11