From fe7b0e06b537d23a839b3c89c42a04d388d29c27 Mon Sep 17 00:00:00 2001 From: Lukas Harzenetter Date: Thu, 12 Jan 2023 11:48:57 +0100 Subject: [PATCH] Support for Java 17 (#691) --- .github/workflows/build.yml | 14 +- .idea/codeStyles/Project.xml | 9 +- Dockerfile | 6 +- Dockerfile.cli | 3 +- Dockerfile.noBuild | 2 +- NOTICE | 8 +- README.md | 2 +- docs/config/Eclipse/cleanup.xml | 69 --- docs/config/Eclipse/codetemplates.xml | 111 ----- .../Eclipse/figures/eclipse_save_actions.png | Bin 36195 -> 0 bytes ...eclipse_save_actions_1_code_organizing.png | Bin 70733 -> 0 bytes .../eclipse_save_actions_2_code_style.png | Bin 75037 -> 0 bytes ...eclipse_save_actions_3_member_accesses.png | Bin 71372 -> 0 bytes .../eclipse_save_actions_4_missing_code.png | Bin 66642 -> 0 bytes ...clipse_save_actions_5_unnecessary_code.png | Bin 66717 -> 0 bytes docs/config/Eclipse/formatter_settings.xml | 409 ------------------ docs/config/Eclipse/index.md | 76 ---- docs/config/Eclipse/java_editor_templates.xml | 43 -- .../figures/run-step1-edit-configuration.png | Bin 7621 -> 10164 bytes .../figures/run-step10-choose-artifact.png | Bin 3344 -> 0 bytes .../figures/run-step11-select-artifcat.png | Bin 15010 -> 0 bytes ...ep12-set-winery-as-application-context.png | Bin 10854 -> 0 bytes .../run-step2-add-new-configuration.png | Bin 5528 -> 61689 bytes .../figures/run-step3-add-tomcat.png | Bin 34258 -> 0 bytes .../run-step4-configure-tomcat-button.png | Bin 14866 -> 0 bytes .../run-step5-add-appserver-button.png | Bin 4509 -> 0 bytes .../run-step6-set-apache-tomcat-directory.png | Bin 7824 -> 0 bytes .../figures/run-step7-confirm.png | Bin 20303 -> 0 bytes .../figures/run-step8-name-and-no-browser.png | Bin 21909 -> 0 bytes ...-step9-button-add-deployment-artifacts.png | Bin 17972 -> 0 bytes ...n-topologymodeler-step1-add-npm-config.png | Bin 17316 -> 0 bytes .../run-topologymodeler-step2-configure.png | Bin 39047 -> 0 bytes .../figures/run-workflowmodeler-step2.png | Bin 38929 -> 0 bytes docs/config/IntelliJ IDEA/index.md | 168 ++++--- .../winery/bpmn2bpel/Bpmn4Tosca2Bpel.java | 154 ++++--- org.eclipse.winery.common/pom.xml | 4 +- .../configuration/ConfigurationTestUtils.java | 4 +- .../configuration/UiConfigurationObject.java | 10 +- org.eclipse.winery.edmm/pom.xml | 2 +- .../main/resources/template/project/pom.xml | 2 - org.eclipse.winery.model.extension/pom.xml | 32 +- .../ResearchObjectModel.xsd | 2 +- .../{selfservice => }/SelfServiceModel.xsd | 2 +- .../src/test/java/.gitkeep | 0 .../pom.xml | 7 +- org.eclipse.winery.reporting/pom.xml | 7 +- org.eclipse.winery.repository.rest/pom.xml | 15 +- .../sonar-project.web.properties | 25 -- .../eclipse/winery/repository/rest/Prefs.java | 4 +- .../IEntityTemplateResource.java | 11 +- .../src/main/resources/winery.properties | 58 --- .../rest/RestUtilsWithGitBackendTest.java | 7 + .../rest/resources/AbstractResourceTest.java | 62 +-- .../servicetemplates/DriverInjection.json | 16 +- .../baobab_initial_properties_get.json | 2 +- .../src/test/resources/logback-test.xml | 2 +- .../servicetemplates/newVersion.json | 13 +- ...MinimalExampleWithAllPropertyVariants.json | 4 +- ...MinimalExampleWithAllPropertyVariants.json | 4 +- org.eclipse.winery.repository/pom.xml | 11 +- pom.xml | 16 +- 61 files changed, 277 insertions(+), 1119 deletions(-) delete mode 100644 docs/config/Eclipse/cleanup.xml delete mode 100644 docs/config/Eclipse/codetemplates.xml delete mode 100644 docs/config/Eclipse/figures/eclipse_save_actions.png delete mode 100644 docs/config/Eclipse/figures/eclipse_save_actions_1_code_organizing.png delete mode 100644 docs/config/Eclipse/figures/eclipse_save_actions_2_code_style.png delete mode 100644 docs/config/Eclipse/figures/eclipse_save_actions_3_member_accesses.png delete mode 100644 docs/config/Eclipse/figures/eclipse_save_actions_4_missing_code.png delete mode 100644 docs/config/Eclipse/figures/eclipse_save_actions_5_unnecessary_code.png delete mode 100644 docs/config/Eclipse/formatter_settings.xml delete mode 100644 docs/config/Eclipse/index.md delete mode 100644 docs/config/Eclipse/java_editor_templates.xml delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step10-choose-artifact.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step11-select-artifcat.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step12-set-winery-as-application-context.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step3-add-tomcat.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step4-configure-tomcat-button.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step5-add-appserver-button.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step6-set-apache-tomcat-directory.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step7-confirm.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step8-name-and-no-browser.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-step9-button-add-deployment-artifacts.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-topologymodeler-step1-add-npm-config.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-topologymodeler-step2-configure.png delete mode 100644 docs/config/IntelliJ IDEA/figures/run-workflowmodeler-step2.png rename org.eclipse.winery.model.extension/src/main/resources/{researchobject => }/ResearchObjectModel.xsd (97%) rename org.eclipse.winery.model.extension/src/main/resources/{selfservice => }/SelfServiceModel.xsd (98%) delete mode 100644 org.eclipse.winery.model.extension/src/test/java/.gitkeep delete mode 100644 org.eclipse.winery.repository.rest/sonar-project.web.properties delete mode 100644 org.eclipse.winery.repository.rest/src/main/resources/winery.properties diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 67ab76ea77..1317256f97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - id: skip_check uses: fkirc/skip-duplicate-actions@master - java11: + java17: needs: pre_job if: | needs.pre_job.outputs.should_skip != 'true' @@ -32,14 +32,14 @@ jobs: run: | if grep -i -q '\.all()' org.eclipse.winery.repository.rest/src/test/java/org/eclipse/winery/repository/rest/resources/AbstractResourceTest.java; then - echo "Log output should be shortend. Use .ifValidationFails()!"; + echo "Log output should be shortened. Use .ifValidationFails()!"; exit 1; fi - - name: Set up JDK 11 + - name: Set up JDK uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 cache: 'maven' - name: Build with Maven run: mvn -Pjava -B package @@ -66,11 +66,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: 11 + java-version: 17 cache: 'maven' - name: Build with Maven run: mvn -Pfrontend -B package @@ -82,7 +82,7 @@ jobs: path: ${{ github.workspace }}/org.eclipse.winery.frontends/target/*.war dockerBuild: - needs: [ java11, frontend ] + needs: [ java17, frontend ] runs-on: ubuntu-latest if: ${{ needs.pre_job.outputs.docker_run_required == 'true' }} steps: diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index b4b0a0c57d..1e75f8bfd3 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -46,5 +46,12 @@