Update project meeds dependencies (#326)

exoplatform · Jul 1, 2024 · cc9c153 · cc9c153
1 parent ed8c0b0
commit cc9c153
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 43 deletions.
diff --git a/exo.jcr.component.core/pom.xml b/exo.jcr.component.core/pom.xml
@@ -54,28 +54,28 @@
          <artifactId>jcr</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
+         <groupId>io.meeds.kernel</groupId>
          <artifactId>exo.kernel.commons.test</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
+         <groupId>io.meeds.kernel</groupId>
          <artifactId>exo.kernel.component.command</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
+         <groupId>io.meeds.kernel</groupId>
          <artifactId>exo.kernel.component.common</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
+         <groupId>io.meeds.kernel</groupId>
          <artifactId>exo.kernel.commons</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.core</groupId>
+         <groupId>io.meeds.core</groupId>
          <artifactId>exo.core.component.organization.api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.core</groupId>
+         <groupId>io.meeds.core</groupId>
          <artifactId>exo.core.component.database</artifactId>
          <exclusions>
             <exclusion>
@@ -195,22 +195,22 @@
       </dependency>
 
       <dependency>
-         <groupId>org.exoplatform.gatein.portal</groupId>
-         <artifactId>exo.portal.component.identity</artifactId>
+         <groupId>io.meeds.portal</groupId>
+         <artifactId>portal.component.identity</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.ws</groupId>
+        <groupId>io.meeds.ws</groupId>
         <artifactId>exo.ws.rest.core</artifactId>
         <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.ws</groupId>
+         <groupId>io.meeds.ws</groupId>
          <artifactId>exo.ws.rest.ext</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.ws</groupId>
+         <groupId>io.meeds.ws</groupId>
          <artifactId>exo.ws.commons</artifactId>
          <scope>test</scope>
       </dependency>
@@ -274,7 +274,7 @@
          </exclusions>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
+         <groupId>io.meeds.kernel</groupId>
          <artifactId>exo.kernel.component.ext.cache.impl.infinispan.v8</artifactId>
       </dependency>
       <!-- TCK binaries and deps for repo stub, some eXo API test -->

diff --git a/exo.jcr.component.ext/pom.xml b/exo.jcr.component.ext/pom.xml
@@ -51,7 +51,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.ws</groupId>
+      <groupId>io.meeds.ws</groupId>
       <artifactId>exo.ws.rest.ext</artifactId>
     </dependency>
     <dependency>
@@ -62,13 +62,13 @@
 
 
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons.test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.gatein.portal</groupId>
-      <artifactId>exo.portal.component.identity</artifactId>
+      <groupId>io.meeds.portal</groupId>
+      <artifactId>portal.component.identity</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/exo.jcr.component.ftp/pom.xml b/exo.jcr.component.ftp/pom.xml
@@ -40,13 +40,13 @@
       <artifactId>exo.jcr.component.ext</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons.test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.gatein.portal</groupId>
-      <artifactId>exo.portal.component.identity</artifactId>
+      <groupId>io.meeds.portal</groupId>
+      <artifactId>portal.component.identity</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/exo.jcr.component.webdav/pom.xml b/exo.jcr.component.webdav/pom.xml
@@ -39,13 +39,13 @@
       <artifactId>exo.jcr.component.ext</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons.test</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.gatein.portal</groupId>
-      <artifactId>exo.portal.component.identity</artifactId>
+      <groupId>io.meeds.portal</groupId>
+      <artifactId>portal.component.identity</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/exo.jcr.connectors.jca/pom.xml b/exo.jcr.connectors.jca/pom.xml
@@ -46,12 +46,12 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.container</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/exo.jcr.ext.services/pom.xml b/exo.jcr.ext.services/pom.xml
@@ -55,30 +55,30 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.gatein.portal</groupId>
-      <artifactId>exo.portal.component.api</artifactId>
+      <groupId>io.meeds.portal</groupId>
+      <artifactId>portal.component.api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.gatein.portal</groupId>
-      <artifactId>exo.portal.component.common</artifactId>
+      <groupId>io.meeds.portal</groupId>
+      <artifactId>portal.component.common</artifactId>
       <scope>provided</scope>
     </dependency>
 <!--    <dependency>-->
-<!--      <groupId>org.exoplatform.ws</groupId>-->
+<!--      <groupId>io.meeds.ws</groupId>-->
 <!--      <artifactId>exo.ws.rest.ext</artifactId>-->
 <!--      <scope>provided</scope>-->
 <!--    </dependency>-->
 
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons.test</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.gatein.portal</groupId>
-      <artifactId>exo.portal.component.identity</artifactId>
+      <groupId>io.meeds.portal</groupId>
+      <artifactId>portal.component.identity</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/exo.jcr.ext.services/src/test/resources/conf/standalone/test-configuration.xml b/exo.jcr.ext.services/src/test/resources/conf/standalone/test-configuration.xml
@@ -862,6 +862,6 @@
   </external-component-plugins>
 
   <import>jar:/conf/configuration.xml</import>
-  <import>jar:/conf/exo.portal.component.identity-configuration.xml</import>
+  <import>jar:/conf/portal.component.identity-configuration.xml</import>
 
 </configuration>
diff --git a/exo.jcr.framework.command/pom.xml b/exo.jcr.framework.command/pom.xml
@@ -40,13 +40,13 @@
       </dependency>
 
       <dependency>
-         <groupId>org.exoplatform.kernel</groupId>
+         <groupId>io.meeds.kernel</groupId>
          <artifactId>exo.kernel.commons.test</artifactId>
          <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.gatein.portal</groupId>
-         <artifactId>exo.portal.component.identity</artifactId>
+         <groupId>io.meeds.portal</groupId>
+         <artifactId>portal.component.identity</artifactId>
          <scope>test</scope>
       </dependency>
    </dependencies>

diff --git a/exo.jcr.framework.ftpclient/pom.xml b/exo.jcr.framework.ftpclient/pom.xml
@@ -35,11 +35,11 @@
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.commons.test</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/jcr-packaging/src/main/assemblies/jcr-addon-package.xml b/jcr-packaging/src/main/assemblies/jcr-addon-package.xml
@@ -33,10 +33,9 @@
         <include>*:*:jar</include>
       </includes>
       <excludes>
-        <!-- These old versions of eXo portal are in conflict with new ones under org.exoplatform.gatein.portal -->
-        <exclude>org.exoplatform.ws:*:*</exclude>
-        <exclude>org.exoplatform.kernel:*:*</exclude>
-        <exclude>org.exoplatform.core:*:*</exclude>
+        <exclude>io.meeds.ws:*:*</exclude>
+        <exclude>io.meeds.kernel:*:*</exclude>
+        <exclude>io.meeds.core:*:*</exclude>
         <exclude>org.apache.cxf:*</exclude>
         <!-- No Apache Tomcat artifacts have to be added in the packaging -->
         <exclude>org.apache.tomcat:*</exclude>

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>maven-exo-parent-pom</artifactId>
     <groupId>org.exoplatform</groupId>
-    <version>27-M03</version>
+    <version>27-M04</version>
     <relativePath />
   </parent>