AMBARI-21257. Add ambari prefix for utility and serviceadvisor modules (oleewere)

ambari-agent/pom.xml

@@ -103,8 +103,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>utility</groupId>
-      <artifactId>utility</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-utility</artifactId>
       <scope>test</scope>
       <version>1.0.0.0-SNAPSHOT</version>
     </dependency>

ambari-infra/pom.xml

@@ -178,8 +178,8 @@
   <dependencies>
     <!-- Dependency in order to annotate unit tests with a category. -->
     <dependency>
-      <groupId>utility</groupId>
-      <artifactId>utility</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-utility</artifactId>
       <version>1.0.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>

ambari-logsearch/pom.xml

@@ -184,8 +184,8 @@
   <dependencies>
     <!-- Dependency in order to annotate unit tests with a category. -->
     <dependency>
-      <groupId>utility</groupId>
-      <artifactId>utility</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-utility</artifactId>
       <version>1.0.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>

ambari-metrics/ambari-metrics-timelineservice/pom.xml

@@ -658,8 +658,8 @@
 
     <!-- Dependency in order to annotate unit tests with a category. -->
     <dependency>
-      <groupId>utility</groupId>
-      <artifactId>utility</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-utility</artifactId>
       <version>1.0.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>

ambari-metrics/pom.xml

@@ -22,7 +22,7 @@
   <version>2.0.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
-    <module>../utility</module>
+    <module>../ambari-utility</module>
     <module>ambari-metrics-common</module>
     <module>ambari-metrics-hadoop-sink</module>
     <module>ambari-metrics-flume-sink</module>
@@ -305,8 +305,8 @@
   <dependencies>
     <!-- Dependency in order to annotate unit tests with a category. -->
     <dependency>
-      <groupId>utility</groupId>
-      <artifactId>utility</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-utility</artifactId>
       <version>1.0.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
@@ -320,8 +320,8 @@
       </properties>
       <dependencies>
         <dependency>
-          <groupId>utility</groupId>
-          <artifactId>utility</artifactId>
+          <groupId>org.apache.ambari</groupId>
+          <artifactId>ambari-utility</artifactId>
           <version>1.0.0.0-SNAPSHOT</version>
         </dependency>
       </dependencies>

ambari-project/pom.xml

@@ -569,8 +569,8 @@
               <version>${checkstyle.version}</version>
             </dependency>
             <dependency>
-              <groupId>utility</groupId>
-              <artifactId>utility</artifactId>
+              <groupId>org.apache.ambari</groupId>
+              <artifactId>ambari-utility</artifactId>
               <version>1.0.0.0-SNAPSHOT</version>
             </dependency>
           </dependencies>

ambari-server/pom.xml

@@ -1660,17 +1660,17 @@
       <artifactId>metrics-jvm</artifactId>
       <version>3.1.0</version>
     </dependency>
-    
+
     <dependency>
-      <groupId>serviceadvisor</groupId>
-      <artifactId>serviceadvisor</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-serviceadvisor</artifactId>
       <version>1.0.0.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Dependency in order to annotate unit tests with a category. -->
     <dependency>
-      <groupId>utility</groupId>
-      <artifactId>utility</artifactId>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-utility</artifactId>
       <version>1.0.0.0-SNAPSHOT</version>
       <scope>provided</scope> <!-- for @ApiIgnore -->
     </dependency>

serviceadvisor/pom.xml → ambari-serviceadvisor/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <!-- Can compile this project independently, cd serviceadvisor ; mvn clean package install
+  <!-- Can compile this project independently, cd ambari-serviceadvisor ; mvn clean package install
 
   To test independently without needing the rest of Ambari, simply compile and run as,
-  java -jar serviceadvisor-$VERSION.jar [ACTION] [HOSTS_FILE.json] [SERVICES_FILE.json]
+  java -jar ambari-serviceadvisor-$VERSION.jar [ACTION] [HOSTS_FILE.json] [SERVICES_FILE.json]
   -->
-  <groupId>serviceadvisor</groupId>
-  <artifactId>serviceadvisor</artifactId>
-  <name>Service Advisor</name>
+  <groupId>org.apache.ambari</groupId>
+  <artifactId>ambari-serviceadvisor</artifactId>
+  <name>Ambari Service Advisor</name>
   <version>1.0.0.0-SNAPSHOT</version>
   <description>Service Advisor</description>
 

utility/pom.xml → ambari-utility/pom.xml

@@ -27,8 +27,8 @@
     <relativePath>../ambari-project</relativePath>
   </parent>
 
-  <artifactId>utility</artifactId>
-  <groupId>utility</groupId>
+  <artifactId>ambari-utility</artifactId>
+  <groupId>org.apache.ambari</groupId>
   <version>1.0.0.0-SNAPSHOT</version>
 
   <dependencies>

pom.xml

@@ -402,7 +402,7 @@
             <!-- generated DDL-->
             <exclude>**/createDDL.jdbc</exclude>
             <exclude>**/yarn.lock</exclude>
-            <exclude>utility/target/**</exclude>
+            <exclude>ambari-utility/target/**</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -459,7 +459,7 @@
         </property>
       </activation>
       <modules>
-        <module>serviceadvisor</module>
+        <module>ambari-serviceadvisor</module>
         <module>ambari-web</module>
         <module>ambari-project</module>
         <module>ambari-views</module>
@@ -483,7 +483,7 @@
         </property>
       </activation>
       <modules>
-        <module>serviceadvisor</module>
+        <module>ambari-serviceadvisor</module>
         <module>ambari-web</module>
         <module>ambari-project</module>
         <module>ambari-views</module>
@@ -511,7 +511,7 @@
         <module>ambari-shell</module>
         <module>ambari-logsearch</module>
         <module>ambari-infra</module>
-        <module>serviceadvisor</module>
+        <module>ambari-serviceadvisor</module>
       </modules>
     </profile>
     <profile>
@@ -534,7 +534,7 @@
         <module>ambari-shell</module>
         <module>ambari-logsearch</module>
         <module>ambari-infra</module>
-        <module>serviceadvisor</module>
+        <module>ambari-serviceadvisor</module>
         </modules>
     </profile>
     <profile>
@@ -544,9 +544,9 @@
       </modules>
     </profile>
     <profile>
-      <id>serviceadvisor</id>
+      <id>ambari-serviceadvisor</id>
       <modules>
-        <module>serviceadvisor</module>
+        <module>ambari-serviceadvisor</module>
       </modules>
     </profile>
     <profile>
@@ -557,7 +557,7 @@
         </os>
       </activation>
       <modules>
-        <module>serviceadvisor</module>
+        <module>ambari-serviceadvisor</module>
         <module>ambari-web</module>
         <module>ambari-project</module>
         <module>ambari-views</module>