Update project meeds dependencies (#288)

exoplatform · Jul 9, 2024 · ebba1bc · ebba1bc
1 parent e36d604
commit ebba1bc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/packaging/pom.xml b/packaging/pom.xml
@@ -129,8 +129,8 @@
       <type>zip</type>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.push-notifications</groupId>
-      <artifactId>exo-push-notifications-addon-packaging</artifactId>
+      <groupId>io.meeds.push-notifications</groupId>
+      <artifactId>push-notifications-packaging</artifactId>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
@@ -324,7 +324,7 @@
                   <arg line="install ${addon.exo.documents.id}:${addon.exo.documents.version} --catalog=file://${project.build.directory}/local-catalog/exo-distrib-catalog.json" />
                 </exec>
                 <exec dir="${project.basedir}" executable="${project.build.directory}/${project.build.finalName}/${project.build.finalName}/addon${addon.manager.extension}" failonerror="true">
-                  <arg line="install ${addon.exo.push-notifications.id}:${addon.exo.push-notifications.version}  --catalog=file://${project.build.directory}/local-catalog/exo-distrib-catalog.json" />
+                  <arg line="install ${addon.meeds.push-notifications.id}:${addon.meeds.push-notifications.version}  --catalog=file://${project.build.directory}/local-catalog/exo-distrib-catalog.json" />
                 </exec>
                 <exec dir="${project.basedir}" executable="${project.build.directory}/${project.build.finalName}/${project.build.finalName}/addon${addon.manager.extension}" failonerror="true">
                   <arg line="uninstall meeds-content" />

diff --git a/packaging/src/main/catalog/exo-distrib-catalog.json b/packaging/src/main/catalog/exo-distrib-catalog.json
@@ -239,7 +239,7 @@
     "description": "Gamification Github connector add-on",
     "sourceUrl": "https://github.com/meeds-io/gamification-github",
     "documentationUrl": "https://github.com/meeds-io/gamification-github",
-    "downloadUrl": "file://${settings.localRepository}/org/exoplatform/addons/gamification-github/gamification-github-packaging/${addon.meeds.gamification-github.version}/gamification-github-packaging-${addon.meeds.gamification-github.version}.zip",
+    "downloadUrl": "file://${settings.localRepository}/io/meeds/gamification-github/gamification-github-packaging/${addon.meeds.gamification-github.version}/gamification-github-packaging-${addon.meeds.gamification-github.version}.zip",
     "vendor": "Meeds.io",
     "author": "Meeds.io",
     "license": "LGPLv3",
@@ -251,12 +251,12 @@
   },
   {
     "id": "meeds-push-notifications",
-    "version": "${addon.exo.push-notifications.version}",
+    "version": "${addon.meeds.push-notifications.version}",
     "unstable": true,
     "name": "Mobile Push Notifications",
     "description": "Add Push Notifications for mobile application",
     "sourceUrl": "https://github.com/meeds-io/push-notifications",
-    "downloadUrl": "file://${settings.localRepository}/org/exoplatform/addons/push-notifications/exo-push-notifications-addon-packaging/${addon.exo.push-notifications.version}/exo-push-notifications-addon-packaging-${addon.exo.push-notifications.version}.zip",
+    "downloadUrl": "file://${settings.localRepository}/io/meeds/push-notifications/push-notifications-packaging/${addon.meeds.push-notifications.version}/push-notifications-packaging-${addon.meeds.push-notifications.version}.zip",
     "vendor": "Meeds.io",
     "author": "Meeds.io",
     "license": "LGPLv3",

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>maven-exo-parent-pom</artifactId>
     <groupId>org.exoplatform</groupId>
-    <version>27-M03</version>
+    <version>27-M04</version>
     <relativePath />
   </parent>
   <groupId>org.exoplatform.platform.distributions</groupId>
@@ -59,14 +59,14 @@
     <addon.exo.jcr.version>7.0.x-SNAPSHOT</addon.exo.jcr.version>
     <addon.exo.ecms.id>exo-ecms</addon.exo.ecms.id>
     <addon.exo.ecms.version>7.0.x-SNAPSHOT</addon.exo.ecms.version>
-    <addon.exo.tasks.id>exo-tasks</addon.exo.tasks.id>
-    <addon.exo.tasks.version>7.0.x-exo-SNAPSHOT</addon.exo.tasks.version>
+    <addon.meeds.tasks.id>meeds-tasks</addon.meeds.tasks.id>
+    <addon.meeds.tasks.version>7.0.x-exo-SNAPSHOT</addon.meeds.tasks.version>
     <addon.exo.web-conferencing.id>exo-web-conferencing</addon.exo.web-conferencing.id>
     <addon.exo.web-conferencing.version>7.0.x-SNAPSHOT</addon.exo.web-conferencing.version>
     <addon.exo.jitsi.id>exo-jitsi</addon.exo.jitsi.id>
     <addon.exo.jitsi.version>7.0.x-SNAPSHOT</addon.exo.jitsi.version>
-    <addon.exo.analytics.id>exo-analytics</addon.exo.analytics.id>
-    <addon.exo.analytics.version>7.0.x-exo-SNAPSHOT</addon.exo.analytics.version>
+    <addon.meeds.analytics.id>meeds-analytics</addon.meeds.analytics.id>
+    <addon.meeds.analytics.version>7.0.x-exo-SNAPSHOT</addon.meeds.analytics.version>
     <addon.exo.agenda.id>exo-agenda</addon.exo.agenda.id>
     <addon.exo.agenda.version>7.0.x-SNAPSHOT</addon.exo.agenda.version>
     <addon.exo.digital-workplace.id>exo-digital-workplace</addon.exo.digital-workplace.id>
@@ -81,8 +81,8 @@
     <addon.exo.automatic-translation.version>7.0.x-SNAPSHOT</addon.exo.automatic-translation.version>
     <addon.exo.documents.id>exo-documents</addon.exo.documents.id>
     <addon.exo.documents.version>7.0.x-SNAPSHOT</addon.exo.documents.version>
-    <addon.exo.push-notifications.id>meeds-push-notifications</addon.exo.push-notifications.id>
-    <addon.exo.push-notifications.version>7.0.x-exo-SNAPSHOT</addon.exo.push-notifications.version>
+    <addon.meeds.push-notifications.id>meeds-push-notifications</addon.meeds.push-notifications.id>
+    <addon.meeds.push-notifications.version>7.0.x-exo-SNAPSHOT</addon.meeds.push-notifications.version>
     <!-- Add-on manager extension to use (empty for Unix, .bat for Windows) -->
     <addon.manager.extension />
   </properties>
@@ -173,9 +173,9 @@
         <type>zip</type>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.addons.push-notifications</groupId>
-        <artifactId>exo-push-notifications-addon-packaging</artifactId>
-        <version>${addon.exo.push-notifications.version}</version>
+        <groupId>io.meeds.push-notifications</groupId>
+        <artifactId>push-notifications-packaging</artifactId>
+        <version>${addon.meeds.push-notifications.version}</version>
         <type>zip</type>
         <scope>provided</scope>
       </dependency>

diff --git a/services/pom.xml b/services/pom.xml
@@ -30,12 +30,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.kernel</groupId>
+      <groupId>io.meeds.kernel</groupId>
       <artifactId>exo.kernel.container</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.commons</groupId>
+      <groupId>io.meeds.commons</groupId>
       <artifactId>commons-component-product</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/services/src/main/resources/conf/platform.properties b/services/src/main/resources/conf/platform.properties
@@ -12,7 +12,8 @@ [email protected]@
 org.exoplatform.forum=@addon.exo.forum.version@
 org.exoplatform.wiki=@addon.exo.wiki.version@
 org.exoplatform.ecms=@addon.exo.ecms.version@
-org.exoplatform.social=@org.exoplatform.social.version@
+org.exoplatform.social=@io.meeds.distribution.version@
+io.meeds.social=@io.meeds.social.version@
 org.exoplatform.meeds=@io.meeds.distribution.version@
 
 # Current project's version

diff --git a/services/src/main/resources/conf/portal/configuration.xml b/services/src/main/resources/conf/portal/configuration.xml
@@ -2,7 +2,7 @@
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd">
 
   <component>
-    <type>org.exoplatform.commons.info.ProductInformations</type>
+    <type>io.meeds.commons.info.ProductInformations</type>
     <init-params>
       <value-param>
         <name>product.versions.declaration.file</name>