Create develop-meed and Upgrade Core Versions

Meeds-io · Jul 9, 2024 · 4f79e72 · 4f79e72
1 parent 86846c7
commit 4f79e72
Show file tree

Hide file tree

Showing 24 changed files with 80 additions and 30 deletions.
diff --git a/component/api/pom.xml b/component/api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>portal.component.api</artifactId>

diff --git a/component/common/pom.xml b/component/common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>portal.component.common</artifactId>

diff --git a/component/file-storage/pom.xml b/component/file-storage/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
   <artifactId>portal.component.file-storage</artifactId>
   <packaging>jar</packaging>

diff --git a/component/identity/pom.xml b/component/identity/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/management/pom.xml b/component/management/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/pc/pom.xml b/component/pc/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/pom.xml b/component/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.parent</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <artifactId>portal.component</artifactId>

diff --git a/component/portal/pom.xml b/component/portal/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/resources/pom.xml b/component/resources/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/scripting/pom.xml b/component/scripting/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/test/core/pom.xml b/component/test/core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.test</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/test/pom.xml b/component/test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/test/web/pom.xml b/component/test/web/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.test</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/web/api/pom.xml b/component/web/api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/web/controller/pom.xml b/component/web/controller/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/web/pom.xml b/component/web/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/web/resources/pom.xml b/component/web/resources/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/web/security/pom.xml b/component/web/security/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/component/web/server/pom.xml b/component/web/server/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.component.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -31,15 +31,20 @@
 
   <groupId>io.meeds.portal</groupId>
   <artifactId>portal.parent</artifactId>
-  <version>7.0.x-SNAPSHOT</version>
+  <version>7.0.x-meed-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Meeds - Portal</name>
 
   <properties>
-    <io.meeds.gatein.sso.version>7.0.x-SNAPSHOT</io.meeds.gatein.sso.version>
-    <io.meeds.gatein.pc.version>7.0.x-SNAPSHOT</io.meeds.gatein.pc.version>
-
+    <io.meeds.depmgt.version>23.x-meed-SNAPSHOT</io.meeds.depmgt.version>
+    <io.meeds.kernel.release.version>7.0.0-M08</io.meeds.kernel.release.version>
+    <io.meeds.core.release.version>7.0.0-M08</io.meeds.core.release.version>
+    <io.meeds.ws.release.version>7.0.0-M08</io.meeds.ws.release.version>
+    <io.meeds.gatein.wci.release.version>7.0.0-M08</io.meeds.gatein.wci.release.version>
+    <io.meeds.gatein.sso.release.version>7.0.0-M08</io.meeds.gatein.sso.release.version>
+    <io.meeds.gatein.pc.release.version>7.0.0-M08</io.meeds.gatein.pc.release.version>
+
     <!-- Sonar properties -->
     <sonar.organization>meeds-io</sonar.organization>
 
@@ -60,11 +65,47 @@
 
   <dependencyManagement>
     <dependencies>
+      <!-- Import versions of external dependencies to use -->
+      <dependency>
+        <groupId>io.meeds</groupId>
+        <artifactId>maven-depmgt-pom</artifactId>
+        <version>${io.meeds.depmgt.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- Kernel dependencies -->
+      <dependency>
+        <groupId>io.meeds.kernel</groupId>
+        <artifactId>kernel-parent</artifactId>
+        <version>${io.meeds.kernel.release.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- Core dependencies -->
+      <dependency>
+        <groupId>io.meeds.core</groupId>
+        <artifactId>core-parent</artifactId>
+        <version>${io.meeds.core.release.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+      <!-- WS dependencies -->
+      <dependency>
+        <groupId>io.meeds.ws</groupId>
+        <artifactId>ws-parent</artifactId>
+        <version>${io.meeds.ws.release.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- GateIn-PC dependencies -->
       <dependency>
         <groupId>io.meeds.gatein.pc</groupId>
         <artifactId>pc-parent</artifactId>
-        <version>${io.meeds.gatein.pc.version}</version>
+        <version>${io.meeds.gatein.pc.release.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -73,11 +114,20 @@
       <dependency>
         <groupId>io.meeds.gatein.sso</groupId>
         <artifactId>sso-parent</artifactId>
-        <version>${io.meeds.gatein.sso.version}</version>
+        <version>${io.meeds.gatein.sso.release.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
+
+      <!-- GateIn-WCI dependencies -->
+      <dependency>
+        <groupId>io.meeds.gatein.wci</groupId>
+        <artifactId>wci-parent</artifactId>
+        <version>${io.meeds.gatein.wci.release.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <!-- Internal project artifacts -->
       <dependency>
         <groupId>${project.groupId}</groupId>

diff --git a/web/pom.xml b/web/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.parent</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <artifactId>portal.web</artifactId>

diff --git a/web/portal/pom.xml b/web/portal/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/web/rest/pom.xml b/web/rest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.web</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/webui/pom.xml b/webui/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>io.meeds.portal</groupId>
     <artifactId>portal.parent</artifactId>
-    <version>7.0.x-SNAPSHOT</version>
+    <version>7.0.x-meed-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>