[releng] Fix the publish part of the workflow

Signed-off-by: Laurent Fasani <[email protected]>
ObeoNetwork · Nov 28, 2024 · e7572fb · e7572fb
1 parent 94af3c3
commit e7572fb
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 54 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -67,7 +67,7 @@ jobs:
         run: mvn -U -B -e clean verify  -f backend/pom.xml --settings settings.xml
 
       - name: Publish the backend
-        if: startsWith(github.ref, 'refs/tags/v')
+        # if: startsWith(github.ref, 'refs/tags/v')
         env:
           USERNAME: ${{ github.actor }}
           PASSWORD: ${{ github.token }}

diff --git a/backend/deeplab-application/pom.xml b/backend/deeplab-application/pom.xml
@@ -29,14 +29,6 @@
 		<java.version>17</java.version>
 	</properties>
 
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>ObeoNetwork Pepper</name>
-			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
-		</repository>
-	</distributionManagement>
-
 	<repositories>
 		<repository>
 			<id>github-sirius-web</id>

diff --git a/backend/deeplab-frontend/pom.xml b/backend/deeplab-frontend/pom.xml
@@ -16,10 +16,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.3</version>
-		<relativePath /> <!-- lookup parent from repository -->
+		<groupId>deeplab</groupId>
+		<artifactId>deeplab-parent</artifactId>
+		<version>2024.11.0</version>
+		<relativePath>../deeplab-parent</relativePath>
 	</parent>
 	<groupId>deeplab</groupId>
 	<artifactId>deeplab-frontend</artifactId>
@@ -31,14 +31,6 @@
 		<java.version>17</java.version>
 	</properties>
 
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>ObeoNetwork Pepper</name>
-			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
-		</repository>
-	</distributionManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/backend/deeplab-parent/pom.xml b/backend/deeplab-parent/pom.xml
@@ -34,6 +34,13 @@
 		<sirius.version>7.2.0-SNAPSHOT</sirius.version>
 	</properties>
 
+	<distributionManagement>
+		<repository>
+			<id>github-pepper</id>
+			<name>ObeoNetwork Pepper</name>
+			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
+		</repository>
+	</distributionManagement>
 
 	<repositories>
 		<repository>
@@ -70,11 +77,6 @@
 				<artifactId>sirius-components-view-builder</artifactId>
 				<version>${sirius.web.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.sirius</groupId>
-				<artifactId>sirius-components-collaborative-trees</artifactId>
-				<version>${sirius.web.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.sirius</groupId>
 				<artifactId>sirius-components-trees</artifactId>

diff --git a/backend/deeplab-projectmanagement-edit/pom.xml b/backend/deeplab-projectmanagement-edit/pom.xml
@@ -29,14 +29,6 @@
 		<java.version>17</java.version>
 	</properties>
 
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>ObeoNetwork Pepper</name>
-			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
-		</repository>
-	</distributionManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>

diff --git a/backend/deeplab-projectmanagement-starter/pom.xml b/backend/deeplab-projectmanagement-starter/pom.xml
@@ -30,14 +30,6 @@
 		<sirius.version>7.2.0-SNAPSHOT</sirius.version>
 	</properties>
 
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>ObeoNetwork Pepper</name>
-			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
-		</repository>
-	</distributionManagement>
-
 	<repositories>
 		<repository>
 			<id>Eclipse Sirius</id>

diff --git a/backend/deeplab-projectmanagement/pom.xml b/backend/deeplab-projectmanagement/pom.xml
@@ -29,14 +29,6 @@
 		<java.version>17</java.version>
 	</properties>
 
-	<distributionManagement>
-		<repository>
-			<id>github</id>
-			<name>ObeoNetwork Pepper</name>
-			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
-		</repository>
-	</distributionManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.eclipse.emf</groupId>

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -24,6 +24,13 @@
 	<description>Pepper for project management</description>
 	<packaging>pom</packaging>
 
+	<distributionManagement>
+		<repository>
+			<id>github-pepper</id>
+			<name>ObeoNetwork Pepper</name>
+			<url>https://maven.pkg.github.com/ObeoNetwork/pepper</url>
+		</repository>
+	</distributionManagement>
 
 	<!-- reminder
 	

diff --git a/settings.xml b/settings.xml
@@ -1,7 +1,6 @@
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
 
   <activeProfiles>
     <activeProfile>github</activeProfile>
@@ -14,8 +13,12 @@
         <repository>
           <id>central</id>
           <url>https://repo1.maven.org/maven2</url>
-          <releases><enabled>true</enabled></releases>
-          <snapshots><enabled>true</enabled></snapshots>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
         </repository>
         <repository>
           <id>github-sirius-web</id>
@@ -42,5 +45,10 @@
       <username>${env.USERNAME}</username>
       <password>${env.PASSWORD}</password>
     </server>
+    <server>
+      <id>github-pepper</id>
+      <username>${env.USERNAME}</username>
+      <password>${env.PASSWORD}</password>
+    </server>
   </servers>
 </settings>