diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7524be2a94..cb4ae95580 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,18 @@ - +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** + + +- Start and end date: +- Contributor: +- Supervisor: + + + +- [ ] 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 diff --git a/LICENSE.spdx b/LICENSE.spdx index 73d7dbfcfb..f21d4799fb 100644 --- a/LICENSE.spdx +++ b/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 diff --git a/README.md b/README.md index b8b87f0c16..a68d5f7db2 100644 --- a/README.md +++ b/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 . Winery is also part of the OpenTOSCA ecosystem where more information is available at . @@ -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 . @@ -26,6 +28,32 @@ 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