diff --git a/.github/renovate.json b/.github/renovate.json index fe5940e6ba..4d3b657150 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -12,17 +12,12 @@ "timezone": "Europe/London", "schedule": ["before 4am on Monday"], - "major": { - "dependencyDashboardApproval": true - }, - "assignees": ["SimonCockx"], "packageRules": [ { "description": "Group all Eclipse related dependencies (including Xtext). Because these dependencies often introduce breaking changes in minor version upgrades, we always require an explicit approval in the dependency dashboard before creating a PR.", "matchPackagePatterns": ["^org\\.eclipse\\."], - "dependencyDashboardApproval": true, "groupName": "eclipse dependencies", "groupSlug": "eclipse-dependencies" }, @@ -49,5 +44,5 @@ } ], - "ignoreDeps": ["org.eclipse.m2e:lifecycle-mapping"] + "ignoreDeps": ["org.eclipse.m2e:lifecycle-mapping", "com.regnosys.rosetta:com.regnosys.rosetta.parent"] } diff --git a/.github/workflows/branch-deploy.yml b/.github/workflows/branch-deploy.yml index 8117045697..debdee3a35 100644 --- a/.github/workflows/branch-deploy.yml +++ b/.github/workflows/branch-deploy.yml @@ -20,7 +20,7 @@ jobs: run: mvn -B versions:set -DnewVersion=0.0.0.${{ steps.normalize-branch-name.outputs.normalized }}-SNAPSHOT - uses: ./.github/actions/maven-build with: - build-command: deploy # Deploy a snapshot build of master + build-command: deploy # Deploy a snapshot build of main env: CI_DEPLOY_USERNAME: ${{ vars.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} diff --git a/.github/workflows/cve-scanning.yml b/.github/workflows/cve-scanning.yml index 0974dccf90..e294122597 100644 --- a/.github/workflows/cve-scanning.yml +++ b/.github/workflows/cve-scanning.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - master + - main paths: - 'pom.xml' - 'CVE-suppressions.xml' diff --git a/.github/workflows/license-scanning.yml b/.github/workflows/license-scanning.yml index 6471eabd6f..3de4bd13e8 100644 --- a/.github/workflows/license-scanning.yml +++ b/.github/workflows/license-scanning.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - master + - main paths: - 'pom.xml' - '.github/workflows/license-scanning.yml' @@ -34,6 +34,7 @@ jobs: run: pip install xq - uses: ./.github/actions/maven-build with: + build-command: install run-tests: false - name: License XML report run: mvn org.codehaus.mojo:license-maven-plugin:2.0.0:download-licenses diff --git a/.github/workflows/master-build.yml b/.github/workflows/main-build.yml similarity index 82% rename from .github/workflows/master-build.yml rename to .github/workflows/main-build.yml index aa5e6b0bb0..ea84f384ae 100644 --- a/.github/workflows/master-build.yml +++ b/.github/workflows/main-build.yml @@ -1,9 +1,9 @@ -name: Build master branch and upload dependency graph +name: Build main branch and upload dependency graph on: workflow_dispatch: push: - branches: [ master ] + branches: [ main ] # Cancel previous jobs concurrency: @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/maven-build with: - build-command: deploy # Deploy a snapshot build of master + build-command: deploy # Deploy a snapshot build of main env: CI_DEPLOY_USERNAME: ${{ vars.CI_DEPLOY_USERNAME }} CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} diff --git a/pom.xml b/pom.xml index 0d44097577..8176198e3d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT pom Rosetta DSL Parent POM diff --git a/rosetta-ide/pom.xml b/rosetta-ide/pom.xml index 10d084e851..62df2d82ee 100644 --- a/rosetta-ide/pom.xml +++ b/rosetta-ide/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT Rosetta DSL Language Server diff --git a/rosetta-lang/pom.xml b/rosetta-lang/pom.xml index f1c0bbd652..247b85b324 100644 --- a/rosetta-lang/pom.xml +++ b/rosetta-lang/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT Rosetta DSL SDK diff --git a/rosetta-maven-plugin/pom.xml b/rosetta-maven-plugin/pom.xml index 4835170672..63977743d0 100644 --- a/rosetta-maven-plugin/pom.xml +++ b/rosetta-maven-plugin/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT rosetta-maven-plugin maven-plugin diff --git a/rosetta-profiling/pom.xml b/rosetta-profiling/pom.xml index da5399bd3f..748e473711 100644 --- a/rosetta-profiling/pom.xml +++ b/rosetta-profiling/pom.xml @@ -6,7 +6,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT Profiling tools for the Rosetta DSL. diff --git a/rosetta-runtime/pom.xml b/rosetta-runtime/pom.xml index 868747ac53..1d36091572 100644 --- a/rosetta-runtime/pom.xml +++ b/rosetta-runtime/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT Rosetta DSL Runtime diff --git a/rosetta-testing/pom.xml b/rosetta-testing/pom.xml index 05639ed049..b57e2229e9 100644 --- a/rosetta-testing/pom.xml +++ b/rosetta-testing/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT Rosetta DSL Test Project diff --git a/rosetta-tools/pom.xml b/rosetta-tools/pom.xml index 95b28e6551..84ead52289 100644 --- a/rosetta-tools/pom.xml +++ b/rosetta-tools/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT Rosetta DSL Scripts diff --git a/rosetta-xcore-plugin-dependencies/pom.xml b/rosetta-xcore-plugin-dependencies/pom.xml index a1bbf07bed..5f5dbfc078 100644 --- a/rosetta-xcore-plugin-dependencies/pom.xml +++ b/rosetta-xcore-plugin-dependencies/pom.xml @@ -22,7 +22,7 @@ com.regnosys.rosetta com.regnosys.rosetta.parent - 0.0.0.master-SNAPSHOT + 0.0.0.main-SNAPSHOT