Merge remote-tracking branch 'upstream/ustutt' into WIP/license-frontend-enhancement

Author: lanrekkeeg

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,18 @@
-<!-- describe the changes you have made here: what, why, ... -->
+Use the following template for the PR title and delete this line: [WIP] Title of the thesis/work/target
 
-- [ ] Ensure that you followed our [toolchain guide](https://github.com/eclipse/winery/blob/main/docs/dev/github-workflow.md#github---prepare-final-pull-request). Especially, we require **a single commit**
+<!-- Replace this placeholder by a short description of the aim -->
+
+- Start and end date: <!-- 2017-01-01 to 2017-08-01 -->
+- Contributor: <!-- full name plus GitHub name -- e.g., Lukas Harzenetter, @lharzenetter -->
+- Supervisor: <!-- full name plus GitHub name -- e.g., Karoline Saatkamp, @saatkamp -->
+
+<!-- 
+Replace this placeholder by a short description of the current state. What is done? What are the next steps?
+Please update this description regularly.
+-->
+
+- [ ] Ensure that you followed our [toolchain guide](https://github.com/eclipse/winery/blob/master/docs/dev/github-workflow.md#github---prepare-final-pull-request).
+- [ ] Branch name checked. That means, the branch name starts with `thesis/`, `fix/`, ...
 - [ ] Ensure that the commit message is [a good commit message](https://github.com/joelparkerhenderson/git_commit_message)
 - [ ] Ensure to use auto format in **all** files
 - [ ] Ensure that you appear in `NOTICE` at Copyright Holders

.github/workflows/build.yml

@@ -20,26 +20,26 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
 
-  java11:
+  java17:
     needs: pre_job
     if: |
       needs.pre_job.outputs.should_skip != 'true'
       || needs.pre_job.outputs.docker_run_required == 'true'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Check if AbstractResourceTest does not cotain log().all().
+      - uses: actions/checkout@v3
+      - name: Check if AbstractResourceTest does not contain log().all().
         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
-        uses: actions/setup-java@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
           cache: 'maven'
       - name: Build with Maven
         run: mvn -Pjava -B package
@@ -65,12 +65,19 @@ jobs:
       || needs.pre_job.outputs.docker_run_required == 'true'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.npm
+          key: npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            npm-${{ runner.os }}
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
           cache: 'maven'
       - name: Build with Maven
         run: mvn -Pfrontend -B package
@@ -82,11 +89,11 @@ 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:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3
         with:
           name: artifacts
@@ -97,7 +104,7 @@ jobs:
           mv org.eclipse.winery.repository.rest/target/winery.war winery.war
           ls -al
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: amd64,arm64,arm
       - name: Set variables
@@ -116,9 +123,9 @@ jobs:
           # Set output parameters.
           echo ::set-output name=tags::${TAGS}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}

.idea/codeStyles/Project.xml

@@ -1,10 +1,10 @@
-FROM maven:3-openjdk-11 as builder
-RUN apt-get update -qq && apt-get install -qqy python build-essential
+FROM maven:3-openjdk-17 as builder
+#RUN apt-get update -qq && apt-get install -qqy python build-essential
 COPY . /tmp/winery
 WORKDIR /tmp/winery
 RUN mvn package -DskipTests=true -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -B
 
-FROM tomcat:9-jdk11-openjdk-buster
+FROM tomcat:9-jdk17-openjdk-buster
 LABEL maintainer = "Oliver Kopp <kopp.dev@gmail.com>, Michael Wurster <miwurster@gmail.com>, Lukas Harzenetter <lharzenetter@gmx.de>"
 
 ENV WINERY_USER_ID 1724

.idea/runConfigurations/Topologymodeler.xml

@@ -1,6 +1,5 @@
-FROM openjdk:11-jre
-LABEL maintainer "Oliver Kopp <kopp.dev@gmail.com>, Lukas Harzenetter <lharzenetter@gmx.de>"
-
+FROM openjdk:17-bullseye
+LABEL maintainer = "Oliver Kopp <kopp.dev@gmail.com>, Lukas Harzenetter <lharzenetter@gmx.de>"
 RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
 RUN apt-get update && apt-get install -y git git-lfs
 

.idea/runConfigurations/Winery.xml

@@ -1,4 +1,4 @@
-FROM tomcat:9-jdk11-openjdk-buster
+FROM tomcat:9-jdk17-openjdk-buster
 LABEL maintainer = "Oliver Kopp <kopp.dev@gmail.com>, Michael Wurster <miwurster@gmail.com>, Lukas Harzenetter <lharzenetter@gmx.de>"
 
 ENV WINERY_USER_ID 1724

.idea/runConfigurations/Workflowmodeler.xml

@@ -1,5 +1,5 @@
 SPDXVersion: SPDX-2.1
-PackageName: Eclipse Winery
-PackageOriginator: Eclipse Foundation
-PackageHomePage: https://github.com/ecipse/winery
+PackageName: OpenTOSCA Winery
+PackageOriginator: University of Stuttgart
+PackageHomePage: https://github.com/OpenTOSCA/winery
 PackageLicenseDeclared: Apache-2.0 OR EPL-2.0