Merge remote-tracking branch 'upstream/ustutt' into WIP/license-front…

…end-enhancement

.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 }}

Dockerfile

@@ -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 <[email protected]>, Michael Wurster <[email protected]>, Lukas Harzenetter <[email protected]>"
 
 ENV WINERY_USER_ID 1724

Dockerfile.cli

@@ -1,6 +1,5 @@
-FROM openjdk:11-jre
-LABEL maintainer "Oliver Kopp <[email protected]>, Lukas Harzenetter <[email protected]>"
-
+FROM openjdk:17-bullseye
+LABEL maintainer = "Oliver Kopp <[email protected]>, Lukas Harzenetter <[email protected]>"
 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
 

Dockerfile.noBuild

@@ -1,4 +1,4 @@
-FROM tomcat:9-jdk11-openjdk-buster
+FROM tomcat:9-jdk17-openjdk-buster
 LABEL maintainer = "Oliver Kopp <[email protected]>, Michael Wurster <[email protected]>, Lukas Harzenetter <[email protected]>"
 
 ENV WINERY_USER_ID 1724

LICENSE.spdx

@@ -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

NOTICE

@@ -21,7 +21,7 @@ The project maintains the following source code repository:
 
 == Copyright Holders
 
-Copyright (c) 2012-2022 University of Stuttgart
+Copyright (c) 2012-2023 University of Stuttgart
 Copyright (c) 2012-2018 C. Timurhan Sungur
 Copyright (c) 2012-2018 Oliver Kopp
 Copyright (c) 2012-2017 Uwe Breitenbücher
@@ -38,7 +38,7 @@ Copyright (c) 2016 Andrew Grimberg
 Copyright (c) 2016-2017 Armin Hueneburg
 Copyright (c) 2016-2018 Kálmán Képes
 Copyright (c) 2016-2017 Lukas Balzer
-Copyright (c) 2016-2022 Lukas Harzenetter
+Copyright (c) 2016-2023 Lukas Harzenetter
 Copyright (c) 2016-2017 Nicole Keppler
 Copyright (c) 2016-2017 Niko Stadelmaier
 Copyright (c) 2016-2017 Philipp Meyer
@@ -49,7 +49,7 @@ Copyright (c) 2017-2020 Clemens Lieb
 Copyright (c) 2017 Heiko Nickerl
 Copyright (c) 2017 Huabing Zhao
 Copyright (c) 2017 Huixin Liu
-Copyright (c) 2017-2021 Karoline Saatkamp
+Copyright (c) 2017-2023 Karoline Saatkamp
 Copyright (c) 2017 Marvin Wohlfarth
 Copyright (c) 2017 Michael Falkenthal
 Copyright (c) 2017-2021 Michael Wurster
@@ -64,13 +64,13 @@ Copyright (c) 2017 ZTE Coperation
 Copyright (c) 2018, 2020-2021 Adrian Wersching
 Copyright (c) 2018-2021 Björn Müller
 Copyright (c) 2018 Christoph Krieger
-Copyright (c) 2018-2020 Ghareeb Falazi
+Copyright (c) 2018-2023 Ghareeb Falazi
 Copyright (c) 2018 Julian Sudendorf
 Copyright (c) 2018 Marius Altmann
 Copyright (c) 2018 Markus Fischer
 Copyright (c) 2018-2020 Vladimir Yussupov
 Copyright (c) 2019 Benjamin Weder
-Copyright (c) 2019-2020 Dominik Voigt
+Copyright (c) 2019-2023 Dominik Voigt
 Copyright (c) 2019 Lisa Podszun
 Copyright (c) 2019-2020 Felix Burk
 Copyright (c) 2019-2020 Johannes Hepp

README.md

@@ -1,4 +1,4 @@
-# Eclipse Winery
+# Eclipse Winery – OpenTOSCA fork
 
 [![License](https://img.shields.io/badge/License-EPL%202.0-blue.svg)](https://opensource.org/licenses/EPL-2.0)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
@@ -7,6 +7,9 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/4f342f5d0f534d84b40f2fe5143f412e)](https://www.codacy.com/gh/OpenTOSCA/winery/dashboard?utm_source=github.com&utm_medium=referral&utm_content=OpenTOSCA/winery&utm_campaign=Badge_Grade)
 [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/4f342f5d0f534d84b40f2fe5143f412e)](https://www.codacy.com/gh/OpenTOSCA/winery/dashboard?utm_source=github.com&utm_medium=referral&utm_content=OpenTOSCA/winery&utm_campaign=Badge_Coverage)
 
+This is a fork of [Eclipse Winery](https://github.com/eclipse/winery) and might include current research results not yet approved by Eclipse legal.
+Find out more about the OpenTOSCA eco system at [www.opentosca.org](http://www.opentosca.org/).
+
 Winery is a web-based environment to graphically model TOSCA topologies and plans managing these topologies.
 It is an Eclipse project and thus support is available through its project page <https://eclipse.org/winery>.
 Winery is also part of the OpenTOSCA ecosystem where more information is available at <http://www.opentosca.org>.
@@ -17,7 +20,6 @@ There was no software security check of Eclipse Winery in the past.
 There might be [remote code execution vulnerabilities](https://github.com/mbechler/marshalsec). 
 Thus, when hosting Eclipse Winery, make it accessible to trustworthy parties only.
 
-
 ## Getting Started
 
 Both development and user documentation is available at <https://eclipse.github.io/winery>.
@@ -26,17 +28,43 @@ The source for the documentation can be found in the [docs](docs) directory.
 ## Video
 
 [![](docs/user/figures/video.png)](https://youtu.be/hj7iBadt7D8)
+## Differences to Eclipse Winery
+
+The branch `ustutt` differs from eclipse/winery in the following files:
+
+- [.github/PULL_REQUEST_TEMPLATE.md](.github/PULL_REQUEST_TEMPLATE.md) - extended for USTUTT students
+- [README.md](README.md) - This text file + disclaimer
+- [LICENSE.spdx](LICENSE.spdx) - Update OpenTOSCA specifics
+
+One can find out the differences between the `ustutt` branch of OpenTOSCA/winery and the `master` branch of eclipse/winery by executing the following command:
+
+    git fetch --all
+    git difftool upstream/master origin/ustutt
+
+Precondition:
+
+    git remote add upstream https://github.com/eclipse/winery.git
+
+## Haftungsausschluss
+
+Dies ist ein Forschungsprototyp.
+Die Haftung für entgangenen Gewinn, Produktionsausfall, Betriebsunterbrechung, entgangene Nutzungen, Verlust von Daten und Informationen, Finanzierungsaufwendungen sowie sonstige Vermögens- und Folgeschäden ist, außer in Fällen von grober Fahrlässigkeit, Vorsatz und Personenschäden ausgeschlossen.
+
+## Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
 
 ## Acknowledgements
 
 The initial code contribution has been supported by the Federal Ministry for Economic Affairs and Energy as part of the [CloudCycle] project (01MD11023).
-Current development is supported by the [Federal Ministry for Economic Affairs and Climate Action] as part of the [PlanQK] project (01MK20005N), the [DFG] (Deutsche Forschungsgemeinschaft) project [ReSUS] (425911815), as well as the DFG’s Excellence Initiative project [SimTech] (EXC 2075 - 390740016).
+Current development is supported by the [Federal Ministry for Economic Affairs and Climate Action] as part of the [PlanQK] project (01MK20005N), the [DFG] (Deutsche Forschungsgemeinschaft) projects [ReSUS] (425911815) and [IAC²] (314720630), as well as the DFG’s Excellence Initiative project [SimTech] (EXC 2075 - 390740016).
 Additional development has been funded by the Federal Ministry for Economic Affairs and Energy projects [SmartOrchestra] (01MD16001F) and [SePiA.Pro] (01MD16013F), as well as by the DFG projects [SustainLife] (641730) and [ADDCompliance] (636503).
 Further development is also funded by the European Union’s Horizon 2020 project [RADON] (825040).
 
 ## License
 
-Copyright (c) 2012-2022 Contributors to the Eclipse Foundation
+Copyright (c) 2012-2023 Contributors to the Eclipse Foundation
 
 See the NOTICE file(s) distributed with this work for additional
 information regarding copyright ownership.
@@ -60,3 +88,4 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
   [PlanQK]: https://planqk.de
   [SimTech]: https://www.simtech.uni-stuttgart.de/
   [ReSUS]: https://www.iaas.uni-stuttgart.de/en/projects/resus/
+  [IAC²]: https://www.iaas.uni-stuttgart.de/forschung/projekte/iacc/

docker/docker-entrypoint.sh

@@ -28,7 +28,7 @@ if [ ! "x${WINERY_DEPENDENT_REPOSITORIES}" = "x" ]; then
   echo ${WINERY_DEPENDENT_REPOSITORIES} > ${FILE}
 fi
 cd ${WINERY_REPOSITORY_PATH}
-export CATALINA_OPTS="-Djava.security.egd=file:/dev/./urandom -Xms512m -Xmx${WINERY_HEAP_MAX} -Duser.home=${WINERY_USER_HOME}"
+export CATALINA_OPTS="-Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Xms512m -Xmx${WINERY_HEAP_MAX} -Duser.home=${WINERY_USER_HOME}"
 if [ ! "x${WINERY_JMX_ENABLED}" = "x" ]; then
   export CATALINA_OPTS="${CATALINA_OPTS} -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.rmi.port=9010 -Djava.rmi.server.hostname=0.0.0.0 -Dcom.sun.management.jmxremote.ssl=false"
 fi