Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -49,5 +44,5 @@
}
],

"ignoreDeps": ["org.eclipse.m2e:lifecycle-mapping"]
"ignoreDeps": ["org.eclipse.m2e:lifecycle-mapping", "com.regnosys.rosetta:com.regnosys.rosetta.parent"]
}
2 changes: 1 addition & 1 deletion .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion .github/workflows/cve-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
paths:
- 'pom.xml'
- 'CVE-suppressions.xml'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/license-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
branches:
- master
- main
paths:
- 'pom.xml'
- '.github/workflows/license-scanning.yml'
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Rosetta DSL Parent POM</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-ide/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>

<name>Rosetta DSL Language Server</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-lang/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>

<name>Rosetta DSL SDK</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>
<artifactId>rosetta-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-profiling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>

<name>Profiling tools for the Rosetta DSL.</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>

<name>Rosetta DSL Runtime</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>

<name>Rosetta DSL Test Project</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>

<name>Rosetta DSL Scripts</name>
Expand Down
2 changes: 1 addition & 1 deletion rosetta-xcore-plugin-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.regnosys.rosetta</groupId>
<artifactId>com.regnosys.rosetta.parent</artifactId>
<version>0.0.0.master-SNAPSHOT</version>
<version>0.0.0.main-SNAPSHOT</version>
</parent>
<!-- TODO: this should be packaged as a pom, but Eclipse doesn't handle it well. -->
<!--<packaging>pom</packaging>-->
Expand Down