diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 1e453b6719..7524be2a94 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ -- [ ] Ensure that you followed our [toolchain guide](https://github.com/eclipse/winery/blob/master/docs/dev/github-workflow.md#github---prepare-final-pull-request). Especially, we require **a single commit** +- [ ] 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** - [ ] 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/.github/workflows/build.yml b/.github/workflows/build.yml index abcca7a0c9..b25c3c2009 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: Winery CI on: push: branches: - - master + - main pull_request: jobs: diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index 20311fa5fa..ab15ede2d9 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -5,7 +5,7 @@ name: Push docker images to Dockerhub on: push: branches: - - master + - main tags: - "v*.*.*" diff --git a/CHANGELOG.md b/CHANGELOG.md index f201a10b1b..1bc113e93c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Here, the categories "Changed" for added and changed functionality, We refer to [GitHub issues](https://github.com/eclipse/winery/issues) by using `#NUM`. The ordering of v1.x and v2.x versions is sequential by time. -This is similar to [Angular's CHANGELOG.md](https://github.com/angular/angular/blob/master/CHANGELOG.md), where v4.x and v5.x is mixed. +This is similar to [Angular's CHANGELOG.md](https://github.com/angular/angular/blob/main/CHANGELOG.md), where v4.x and v5.x is mixed. ## [unreleased] @@ -75,6 +75,6 @@ Intermediate milestone build for the OpenTOSCA eco system. This was the initial code contribution when handing over project governance to the Eclipse Software Foundation. See also [CQ 7916](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=7916). -[unreleased]: https://github.com/eclipse/winery/compare/v2.0.0-M1...master +[unreleased]: https://github.com/eclipse/winery/compare/v2.0.0-M1...main [v2.0.0-M1]: https://github.com/eclipse/winery/compare/initial-code-contribution...v2.0.0-M1 [v1.0.0]: https://github.com/eclipse/winery/compare/initial-code-contribution...v1.0.0 diff --git a/deploy/che/devfile.yml b/deploy/che/devfile.yml index 534a48daa6..8fa2eb301e 100644 --- a/deploy/che/devfile.yml +++ b/deploy/che/devfile.yml @@ -21,4 +21,4 @@ components: discoverable: "false" public: "true" mountSources: true - reference: https://raw.githubusercontent.com/eclipse/winery/master/deploy/che/winery.yaml + reference: https://raw.githubusercontent.com/eclipse/winery/main/deploy/che/winery.yaml diff --git a/docs/dev/branches.md b/docs/dev/branches.md index 7adf1e23c6..7e2126ebfe 100644 --- a/docs/dev/branches.md +++ b/docs/dev/branches.md @@ -15,7 +15,7 @@ # Branches -The `master` branch is always compiling and all tests should go through. +The `main` branch is always compiling and all tests should go through. It contains the most recent improvements. All other branches are real development branches and might event not compile. diff --git a/docs/dev/github-workflow.md b/docs/dev/github-workflow.md index 937b313764..29237116a6 100644 --- a/docs/dev/github-workflow.md +++ b/docs/dev/github-workflow.md @@ -36,9 +36,9 @@ For the general setup, please go to [Eclipse Winery Toolchain](toolchain.md). Main idea: Separate branch for each topic (fix a bug, add functionality) and accordingly named. See for more information. - 1. Sync with latest changes on upstream (especially master branch): `git fetch upstream --prune`. - 3. Create branch based on `upstream/master` and make it known publicly: - - `git checkout upstream/master` + 1. Sync with latest changes on upstream (especially main branch): `git fetch upstream --prune`. + 3. Create branch based on `upstream/main` and make it known publicly: + - `git checkout upstream/main` - `git checkout -b [name]` Branch naming patterns: - Bugfix: `fix/SHORT-TITLE`, e.g., `fix/deletion-of-namespaces` @@ -67,9 +67,9 @@ After each working day, do the following: 1. Commit. Don't forget to sign the commit (Ctrl+S in Git Gui). 2. `git push` - 3. Keep your branch updated with `upstream/master`: + 3. Keep your branch updated with `upstream/main`: - `git fetch upstream` - - `git merge upstream/master` + - `git merge upstream/main` - Resolve conflicts - if there are some. See for a documentation when using IntellIJ. - `git push` @@ -89,16 +89,16 @@ This is required by the Eclipse process for checking for intellectual property ( ### Git Steps: Ensure that a single commit is created 1. `git fetch upstream` - fetches all updates from https://github.com/eclipse/winery ("upstream") to the local git storage - 2. `git merge upstream/master` - merges all updates from upstream to the local branch + 2. `git merge upstream/main` - merges all updates from upstream to the local branch 3. (Resolve merge conflicts) - required if there are conflicting changes 4. Commit & Push with signed commit message (Ctrl+S in Git Gui) - this ensures that you have the changes backuped in case something goes wrong at the next steps - 5. `git reset upstream/master` - this prepares that all commits can be squashed together: - The local checkout ("working tree") is left untouched, but the "pointer" of the current branch is reset to `upstream/master`. - Now, Git Gui shows the difference between `upstream/master` and your changes. + 5. `git reset upstream/main` - this prepares that all commits can be squashed together: + The local checkout ("working tree") is left untouched, but the "pointer" of the current branch is reset to `upstream/main`. + Now, Git Gui shows the difference between `upstream/main` and your changes. 6. Check changes in Git Gui: - Each change you wanted: Is it recognized? - At each file: Is the copyright information in the [header](source-code-headers.md) OK? - - Check if you are listed in the [NOTICE](https://github.com/eclipse/winery/blob/master/NOTICE) file as a contributor with the correct year + - Check if you are listed in the [NOTICE](https://github.com/eclipse/winery/blob/main/NOTICE) file as a contributor with the correct year - Are there too much changed lines? 🡒 Do not stage spurious lines to the commit (e.g., tab to spaces, ...) - Are there too much changed files? 🡒 Do not stage files you did not intend to change (e.g., `build.gradle` if you did not touch `build.gradle` at all) - Check again the style (!) diff --git a/docs/dev/property-handling.md b/docs/dev/property-handling.md index dc89271f8f..c186be9e17 100644 --- a/docs/dev/property-handling.md +++ b/docs/dev/property-handling.md @@ -25,7 +25,7 @@ The frontend is build using the web framework angular2. An Angular2 application The following will explain the use of the propertiesDefinition component by example of its usage in the policy type instance. -To make the frontend part of the winery application as modular, component based and generic as possible, the following architecture was chosen ([see here](https://github.com/eclipse/winery/blob/master/docs/dev/RepositoryUI.md)). +To make the frontend part of the winery application as modular, component based and generic as possible, the following architecture was chosen ([see here](https://github.com/eclipse/winery/blob/main/docs/dev/RepositoryUI.md)). The instance component is responsible for rendering most of the types/templates. As a result of that, the components required for a type/template are being injected into the instance components router outlet. This is true for the policy type as well. Here is one example on how to use the propertiesDefinition component by example of the policy type (instance component). diff --git a/docs/index.rst b/docs/index.rst index 842346bd19..a3c1069687 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -52,8 +52,8 @@ Organizational information is provided at the `eclipse.org page - Found an issue? + How to Contribute + Found an issue? Getting support for Eclipse Winery diff --git a/docs/user/faq.rst b/docs/user/faq.rst index e8461f465a..a87d46eae9 100644 --- a/docs/user/faq.rst +++ b/docs/user/faq.rst @@ -81,4 +81,4 @@ A: If you need support, contact us at *opentosca@iaas.uni-stuttgart.de*. Q: How can I contribute to Winery? ********************************** -A: Please see the `contributing guide `_. +A: Please see the `contributing guide `_. diff --git a/org.eclipse.winery.accountability/pom.xml b/org.eclipse.winery.accountability/pom.xml index cff885f6ce..27b8673b5c 100644 --- a/org.eclipse.winery.accountability/pom.xml +++ b/org.eclipse.winery.accountability/pom.xml @@ -136,6 +136,30 @@ + + maven-resources-plugin + 3.0.2 + + + copy-resource-one + generate-sources + + copy-resources + + + ${user.home}/.web3j/solc/ + + + ${project.basedir} + + releases.json + + + + + + + org.web3j web3j-maven-plugin diff --git a/org.eclipse.winery.accountability/releases.json b/org.eclipse.winery.accountability/releases.json new file mode 100644 index 0000000000..a4819345ad --- /dev/null +++ b/org.eclipse.winery.accountability/releases.json @@ -0,0 +1 @@ +[{"version":"0.4.16","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.16/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.16/solc-static-linux"},{"version":"0.4.17","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.17/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.17/solc-static-linux"},{"version":"0.4.18","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.18/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.18/solc-static-linux"},{"version":"0.4.19","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.19/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.19/solc-static-linux"},{"version":"0.4.20","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.20/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.20/solc-static-linux"},{"version":"0.4.21","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.21/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.21/solc-static-linux"},{"version":"0.4.22","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.22/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.22/solc-static-linux"},{"version":"0.4.23","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.23/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.23/solc-static-linux"},{"version":"0.4.24","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.24/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.24/solc-static-linux"},{"version":"0.4.25","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.4.25/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.4.25/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.25/solc-static-linux"},{"version":"0.4.26","windows_url":"","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.4.26/solc-static-linux"},{"version":"0.5.0","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.0/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.0/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.0/solc-static-linux"},{"version":"0.5.1","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.1/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.1/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.1/solc-static-linux"},{"version":"0.5.2","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.2/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.2/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.2/solc-static-linux"},{"version":"0.5.3","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.3/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.3/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.3/solc-static-linux"},{"version":"0.5.4","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.4/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.4/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.4/solc-static-linux"},{"version":"0.5.5","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.5/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.5/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.5/solc-static-linux"},{"version":"0.5.6","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.6/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.6/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.6/solc-static-linux"},{"version":"0.5.7","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.7/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.7/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.7/solc-static-linux"},{"version":"0.5.8","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.8/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.8/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.8/solc-static-linux"},{"version":"0.5.9","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.9/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.9/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.9/solc-static-linux"},{"version":"0.5.10","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.10/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.10/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.10/solc-static-linux"},{"version":"0.5.11","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.11/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.11/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.11/solc-static-linux"},{"version":"0.5.12","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.12/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.12/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.12/solc-static-linux"},{"version":"0.5.13","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.13/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.13/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.13/solc-static-linux"},{"version":"0.5.14","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.14/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.14/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.14/solc-static-linux"},{"version":"0.5.15","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.15/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.15/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.15/solc-static-linux"},{"version":"0.5.16","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.16/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.5.16/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.16/solc-static-linux"},{"version":"0.5.17","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.5.17/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.5.17/solc-static-linux"},{"version":"0.6.0","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.0/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.6.0/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.0/solc-static-linux"},{"version":"0.6.1","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.1/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.6.1/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.1/solc-static-linux"},{"version":"0.6.2","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.2/solidity-windows.zip","mac_url":"https://github.com/web3j/solidity-darwin-binaries/releases/download/v0.6.2/solc_mac","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.2/solc-static-linux"},{"version":"0.6.3","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.3/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.3/solc-static-linux"},{"version":"0.6.4","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.4/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.4/solc-static-linux"},{"version":"0.6.5","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.5/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.5/solc-static-linux"},{"version":"0.6.6","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.6/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.6/solc-static-linux"},{"version":"0.6.7","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.7/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.7/solc-static-linux"},{"version":"0.6.8","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.8/solidity-windows.zip","mac_url":"","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.8/solc-static-linux"},{"version":"0.6.9","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.9/solidity-windows.zip","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.6.9/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.9/solc-static-linux"},{"version":"0.6.10","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.10/solidity-windows.zip","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.6.10/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.10/solc-static-linux"},{"version":"0.6.11","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.11/solidity-windows.zip","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.6.11/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.11/solc-static-linux"},{"version":"0.6.12","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.6.12/solidity-windows.zip","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.6.12/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.6.12/solc-static-linux"},{"version":"0.7.0","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.7.0/solidity-windows.zip","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.0/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.0/solc-static-linux"},{"version":"0.7.1","windows_url":"https://github.com/ethereum/solidity/releases/download/v0.7.1/solidity-windows.zip","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.1/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.1/solc-static-linux"},{"version":"0.7.2","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.2/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.2/solc-static-linux"},{"version":"0.7.3","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.3/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.3/solc-static-linux"},{"version":"0.7.4","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.4/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.4/solc-static-linux"},{"version":"0.7.5","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.5/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.5/solc-static-linux"},{"version":"0.7.6","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.7.6/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.7.6/solc-static-linux"},{"version":"0.8.0","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.0/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.0/solc-static-linux"},{"version":"0.8.1","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.1/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.1/solc-static-linux"},{"version":"0.8.2","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.2/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.2/solc-static-linux"},{"version":"0.8.3","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.3/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.3/solc-static-linux"},{"version":"0.8.4","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.4/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.4/solc-static-linux"},{"version":"0.8.5","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.5/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.5/solc-static-linux"},{"version":"0.8.6","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.6/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.6/solc-static-linux"},{"version":"0.8.7","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.7/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.7/solc-static-linux"},{"version":"0.8.8","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.8/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.8/solc-static-linux"},{"version":"0.8.9","windows_url":"","mac_url":"https://github.com/ethereum/solidity/releases/download/v0.8.9/solc-macos","linux_url":"https://github.com/ethereum/solidity/releases/download/v0.8.9/solc-static-linux"}] \ No newline at end of file diff --git a/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/Constants.java b/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/Constants.java index 055edee266..30ffc4a18e 100644 --- a/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/Constants.java +++ b/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/Constants.java @@ -28,7 +28,7 @@ public class Constants { // $HOME/DEFAULT_REPO_NAME is used public static final Path GLOBAL_REPO_PATH_WINDOWS = Paths.get("C:/" + Constants.DEFAULT_REPO_NAME); - public static final String MASTER_BRANCH = "master"; + public static final String MAIN_BRANCH = "main"; /** * file-system in general diff --git a/org.eclipse.winery.frontends/pom.xml b/org.eclipse.winery.frontends/pom.xml index df08c502bb..7a30a18ee1 100644 --- a/org.eclipse.winery.frontends/pom.xml +++ b/org.eclipse.winery.frontends/pom.xml @@ -98,7 +98,7 @@ com.github.eirslett frontend-maven-plugin - 1.6 + 1.12.0 initialize @@ -107,8 +107,8 @@ install-node-and-npm - v12.13.1 - 6.12.1 + v14.18.0 + 6.14.15 diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/filebased/RepositoryProperties.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/filebased/RepositoryProperties.java index 780f7c643b..603ca3efa6 100644 --- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/filebased/RepositoryProperties.java +++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/backend/filebased/RepositoryProperties.java @@ -29,7 +29,7 @@ public RepositoryProperties(String name, String url) { this.name = name; this.url = url; - this.branch = "master"; + this.branch = "main"; } public RepositoryProperties(String name, String url, String branch) { diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/AbstractGitResolver.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/AbstractGitResolver.java index 1a215f7968..79bcd1cae1 100644 --- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/AbstractGitResolver.java +++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/AbstractGitResolver.java @@ -35,7 +35,7 @@ public abstract class AbstractGitResolver implements IRepositoryResolver { public AbstractGitResolver(String url) { this.repositoryUrl = url; - this.repositoryBranch = "master"; + this.repositoryBranch = "main"; this.repositoryMaintainer = getRepositoryMaintainer(); this.repositoryName = getRepositoryName(); } diff --git a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/RepositoryResolverFactory.java b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/RepositoryResolverFactory.java index e8e3c6afe1..a79f6f5ab7 100644 --- a/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/RepositoryResolverFactory.java +++ b/org.eclipse.winery.repository/src/main/java/org/eclipse/winery/repository/filebased/management/RepositoryResolverFactory.java @@ -28,7 +28,7 @@ public class RepositoryResolverFactory { private static final Logger LOGGER = LoggerFactory.getLogger(RepositoryResolverFactory.class); public static Optional getResolver(String url) { - return getResolver(url, Constants.MASTER_BRANCH); + return getResolver(url, Constants.MAIN_BRANCH); } public static Optional getResolver(String url, String branch) { diff --git a/org.eclipse.winery.repository/src/test/java/org/eclipse/winery/repository/filebased/MultiRepositoryManagerTest.java b/org.eclipse.winery.repository/src/test/java/org/eclipse/winery/repository/filebased/MultiRepositoryManagerTest.java index e63a5cd27b..854e00f3f0 100644 --- a/org.eclipse.winery.repository/src/test/java/org/eclipse/winery/repository/filebased/MultiRepositoryManagerTest.java +++ b/org.eclipse.winery.repository/src/test/java/org/eclipse/winery/repository/filebased/MultiRepositoryManagerTest.java @@ -46,7 +46,7 @@ public class MultiRepositoryManagerTest extends RepositoryTest{ public void testInitializeRepositoryList() throws IOException { ArrayList repositoryList = new ArrayList<>(); repositoryList.add(new RepositoryProperties("mainTestRepository", - "https://github.com/winery/mulit-repo-test")); + "https://github.com/winery/mulit-repo-test", "master")); MultiRepositoryManager multiRepositoryManager = new MultiRepositoryManager(); multiRepositoryManager.initializeRepositoryListForMultiRepositoryAndReconfigureFactory(repositoryList); assertTrue(Paths.get(Environments.getInstance().getRepositoryConfig().getRepositoryRoot(), @@ -69,7 +69,7 @@ public void testInitializeRepositoryList() throws IOException { public void testMultiRepositoryCreation() { ArrayList repositoryList = new ArrayList<>(); repositoryList.add(new RepositoryProperties("mainTestRepository", - "https://github.com/winery/mulit-repo-test")); + "https://github.com/winery/mulit-repo-test", "master")); MultiRepositoryManager multiRepositoryManager = new MultiRepositoryManager(); multiRepositoryManager.initializeRepositoryListForMultiRepositoryAndReconfigureFactory(repositoryList); assertTrue(RepositoryFactory.getRepository() instanceof MultiRepository); @@ -83,7 +83,7 @@ public void testMultiRepositoryCreation() { public void testRepositoryListImport() throws UnsupportedEncodingException { ArrayList repositoryList = new ArrayList<>(); repositoryList.add(new RepositoryProperties("mainTestRepository", - "https://github.com/winery/mulit-repo-test")); + "https://github.com/winery/mulit-repo-test", "master")); repositoryList.add(new RepositoryProperties("standardTestRepository", "https://github.com/winery/test-repository", "plain")); MultiRepositoryManager multiRepositoryManager = new MultiRepositoryManager(); multiRepositoryManager.addRepositoryToFile(repositoryList); diff --git a/pom.xml b/pom.xml index 4ac26970c7..0e9a8044dd 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 2.4.0-b180830.0438 2.4.0-b180725.0427 - 5.6.0 + 5.8.2 1.3.2 2.30.1