feat: Rename Analytics Artifacts - MEED-6999 - Meeds-io/meeds#2097 (#…

…1000)
Meeds-io · Jun 13, 2024 · 5980c4d · 5980c4d
1 parent ef7fa17
commit 5980c4d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 222 deletions.
diff --git a/notes-service/pom.xml b/notes-service/pom.xml
@@ -49,7 +49,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/notes-service/src/main/java/io/meeds/notes/listener/AnalyticsAddTagListener.java b/notes-service/src/main/java/io/meeds/notes/listener/AnalyticsAddTagListener.java
@@ -19,8 +19,8 @@
 package io.meeds.notes.listener;
 
 import org.apache.commons.lang3.StringUtils;
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.listener.Listener;
 import org.exoplatform.services.security.ConversationState;

diff --git a/notes-service/src/test/java/io/meeds/notes/listener/AnalyticsAddTagListenerTest.java b/notes-service/src/test/java/io/meeds/notes/listener/AnalyticsAddTagListenerTest.java
@@ -18,7 +18,7 @@
  */
 package io.meeds.notes.listener;
 
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.services.listener.Event;
 import org.exoplatform.services.security.ConversationState;
 import org.exoplatform.services.security.Identity;

diff --git a/notes-social-integration/pom.xml b/notes-social-integration/pom.xml
@@ -29,7 +29,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/...integration/src/main/java/org/exoplatform/notes/listener/analytics/NotesPageListener.java b/...integration/src/main/java/org/exoplatform/notes/listener/analytics/NotesPageListener.java
@@ -18,14 +18,14 @@
  */
 package org.exoplatform.notes.listener.analytics;
 
-import static org.exoplatform.analytics.utils.AnalyticsUtils.addSpaceStatistics;
+import static io.meeds.analytics.utils.AnalyticsUtils.addSpaceStatistics;
 
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.commons.lang3.StringUtils;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;
 import org.exoplatform.container.component.RequestLifeCycle;

diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -31,7 +31,6 @@
   <import>war:/conf/wiki/dynamic-container-configuration.xml</import>
   <import>war:/conf/wiki/search-configuration.xml</import>
   <import>war:/conf/wiki/ckeditor-configuration.xml</import>
-  <import profiles="analytics">war:/conf/wiki/analytics-ui-watchers-configuration.xml</import>
   <import>war:/conf/wiki/metadata-configuration.xml</import>
 
 </configuration>
diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/analytics-ui-watchers-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/analytics-ui-watchers-configuration.xml
diff --git a/pom.xml b/pom.xml
@@ -29,10 +29,11 @@
     <!-- **************************************** -->
     <!-- Project Dependencies                     -->
     <!-- **************************************** -->
+<<<<<<< HEAD
     <org.exoplatform.social.version>7.0.x-exo-SNAPSHOT</org.exoplatform.social.version>
     <org.exoplatform.platform-ui.version>7.0.x-exo-SNAPSHOT</org.exoplatform.platform-ui.version>
     <addon.exo.gamification.version>7.0.x-exo-SNAPSHOT</addon.exo.gamification.version>
-    <addon.exo.analytics.version>7.0.x-exo-SNAPSHOT</addon.exo.analytics.version>
+    <addon.meeds.analytics.version>7.0.x-exo-SNAPSHOT</addon.meeds.analytics.version>
     <addon.meeds.layout.version>7.0.x-exo-SNAPSHOT</addon.meeds.layout.version>
 
     <!-- Sonar properties -->
@@ -68,9 +69,9 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.addons.analytics</groupId>
+        <groupId>io.meeds.analytics</groupId>
         <artifactId>analytics-parent</artifactId>
-        <version>${addon.exo.analytics.version}</version>
+        <version>${addon.meeds.analytics.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>