Rename master to main (#742)

* main branch setup * Fixed license scanning * Renamed action
finos · Apr 18, 2024 · 6b416a5 · 6b416a5
1 parent 66b10f0
commit 6b416a5
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → .github/workflows/main-build.yml b/.github/workflows/master-build.yml → .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
@@ -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>

diff --git a/rosetta-ide/pom.xml b/rosetta-ide/pom.xml
@@ -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>

diff --git a/rosetta-lang/pom.xml b/rosetta-lang/pom.xml
@@ -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>

diff --git a/rosetta-maven-plugin/pom.xml b/rosetta-maven-plugin/pom.xml
@@ -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>

diff --git a/rosetta-profiling/pom.xml b/rosetta-profiling/pom.xml
@@ -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>

diff --git a/rosetta-runtime/pom.xml b/rosetta-runtime/pom.xml
@@ -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>

diff --git a/rosetta-testing/pom.xml b/rosetta-testing/pom.xml
@@ -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>

diff --git a/rosetta-tools/pom.xml b/rosetta-tools/pom.xml
@@ -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>

diff --git a/rosetta-xcore-plugin-dependencies/pom.xml b/rosetta-xcore-plugin-dependencies/pom.xml
@@ -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>-->