Przeglądaj źródła

[AMBARI-24804] - Unify Ambari Versioning Across Modules (#2488)

Jonathan Hurley 7 lat temu
rodzic
commit
5b012a776b
37 zmienionych plików z 164 dodań i 143 usunięć
  1. 1 2
      ambari-admin/pom.xml
  2. 2 3
      ambari-agent/pom.xml
  3. 2 5
      ambari-funtest/pom.xml
  4. 2 8
      ambari-project/pom.xml
  5. 1 1
      ambari-server-spi/pom.xml
  6. 3 26
      ambari-server/pom.xml
  7. 1 2
      ambari-utility/pom.xml
  8. 1 1
      ambari-views/examples/auto-cluster-view/pom.xml
  9. 2 2
      ambari-views/examples/calculator-view/pom.xml
  10. 2 3
      ambari-views/examples/cluster-view/pom.xml
  11. 2 2
      ambari-views/examples/favorite-view/pom.xml
  12. 2 3
      ambari-views/examples/hello-servlet-view/pom.xml
  13. 2 3
      ambari-views/examples/hello-spring-view/pom.xml
  14. 2 3
      ambari-views/examples/helloworld-view/pom.xml
  15. 3 4
      ambari-views/examples/phone-list-upgrade-view/pom.xml
  16. 2 2
      ambari-views/examples/phone-list-view/pom.xml
  17. 1 2
      ambari-views/examples/pom.xml
  18. 2 3
      ambari-views/examples/property-validator-view/pom.xml
  19. 2 3
      ambari-views/examples/property-view/pom.xml
  20. 2 2
      ambari-views/examples/restricted-view/pom.xml
  21. 2 3
      ambari-views/examples/simple-view/pom.xml
  22. 1 2
      ambari-views/pom.xml
  23. 1 2
      ambari-web/pom.xml
  24. 1 1
      contrib/management-packs/hdf-ambari-mpack/pom.xml
  25. 1 1
      contrib/management-packs/isilon-onefs-mpack/pom.xml
  26. 1 1
      contrib/management-packs/microsoft-r_mpack/pom.xml
  27. 2 3
      contrib/management-packs/pom.xml
  28. 1 2
      contrib/views/ambari-views-package/pom.xml
  29. 2 3
      contrib/views/capacity-scheduler/pom.xml
  30. 3 4
      contrib/views/commons/pom.xml
  31. 4 5
      contrib/views/files/pom.xml
  32. 5 6
      contrib/views/pig/pom.xml
  33. 3 4
      contrib/views/pom.xml
  34. 1 2
      contrib/views/utils/pom.xml
  35. 4 5
      contrib/views/wfmanager/pom.xml
  36. 93 17
      pom.xml
  37. 2 2
      setup.py

+ 1 - 2
ambari-admin/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,6 @@
   <artifactId>ambari-admin</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Admin View</name>
-  <version>2.0.0.0-SNAPSHOT</version>
   <description>Admin control panel</description>
   <build>
     <plugins>

+ 2 - 3
ambari-agent/pom.xml

@@ -19,13 +19,12 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-agent</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Ambari Agent</name>
   <description>Ambari Agent</description>
   <properties>
@@ -145,7 +144,7 @@
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-utility</artifactId>
       <scope>test</scope>
-      <version>1.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

+ 2 - 5
ambari-funtest/pom.xml

@@ -13,13 +13,12 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-funtest</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
-  <packaging>${packagingFormat}</packaging>
+  <packaging>jar</packaging>
   <name>Ambari Functional Tests</name>
   <description>Ambari Functional Tests</description>
   <build>
@@ -120,7 +119,6 @@
         <fileextension.shell>sh</fileextension.shell>
         <fileextension.dot.shell-default></fileextension.dot.shell-default>
         <assemblydescriptor>src/main/assemblies/empty.xml</assemblydescriptor>
-        <packagingFormat>jar</packagingFormat>
       </properties>
     </profile>
     <profile>
@@ -138,7 +136,6 @@
         <fileextension.shell>cmd</fileextension.shell>
         <fileextension.dot.shell-default></fileextension.dot.shell-default>
         <assemblydescriptor>src/main/assemblies/empty.xml</assemblydescriptor>
-        <packagingFormat>jar</packagingFormat>
         </properties>
     </profile>
   </profiles>

+ 2 - 8
ambari-project/pom.xml

@@ -18,11 +18,10 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-project</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <description>Apache Ambari Project POM</description>
   <name>Apache Ambari Project POM</name>
   <packaging>pom</packaging>
@@ -676,11 +675,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.4.1</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
@@ -711,7 +705,7 @@
             <dependency>
               <groupId>org.apache.ambari</groupId>
               <artifactId>ambari-utility</artifactId>
-              <version>1.0.0.0-SNAPSHOT</version>
+              <version>${revision}</version>
             </dependency>
           </dependencies>
         </plugin>

+ 1 - 1
ambari-server-spi/pom.xml

@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <artifactId>ambari-server-spi</artifactId>

+ 3 - 26
ambari-server/pom.xml

@@ -12,15 +12,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-server</artifactId>
-  <packaging>${packagingFormat}</packaging>
+  <packaging>jar</packaging>
   <name>Ambari Server</name>
-  <version>2.0.0.0-SNAPSHOT</version>
   <description>Ambari Server</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -404,26 +403,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.3.9,)</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>com.github.kongchen</groupId>
         <artifactId>swagger-maven-plugin</artifactId>
@@ -934,7 +913,6 @@
         <assemblydescriptor>src/main/assemblies/server-windows.xml</assemblydescriptor>
         <assemblybootstrap>src/main/assemblies/bootstrap-windows.xml</assemblybootstrap>
         <assemblychocodescriptor>src/main/assemblies/server-windows-choco.xml</assemblychocodescriptor>
-        <packagingFormat>jar</packagingFormat>
       </properties>
       <build>
         <plugins>
@@ -1036,7 +1014,6 @@
         <fileextension.dot.shell-default></fileextension.dot.shell-default>
         <path.python.1>${project.basedir}/../ambari-common/src/main/python:${project.basedir}/../ambari-agent/src/main/python:${project.basedir}/../ambari-common/src/main/python/ambari_jinja2:${project.basedir}/../ambari-common/src/main/python/ambari_commons:${project.basedir}/../ambari-common/src/test/python:${project.basedir}/src/main/python:${project.basedir}/src/main/python/ambari-server-state:${project.basedir}/src/main/resources/custom_actions:${project.basedir}/src/main/resources/scripts:${project.basedir}/src/test/python</path.python.1>
         <assemblydescriptor>src/main/assemblies/server.xml</assemblydescriptor>
-        <packagingFormat>jar</packagingFormat>
       </properties>
     </profile>
     <profile>
@@ -1773,7 +1750,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-utility</artifactId>
-      <version>1.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
       <scope>provided</scope> <!-- for @ApiIgnore -->
       <exclusions>
         <exclusion>

+ 1 - 2
ambari-utility/pom.xml

@@ -23,13 +23,12 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
 
   <artifactId>ambari-utility</artifactId>
   <groupId>org.apache.ambari</groupId>
-  <version>1.0.0.0-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

+ 1 - 1
ambari-views/examples/auto-cluster-view/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>auto-cluster-view</artifactId>

+ 2 - 2
ambari-views/examples/calculator-view/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>calculator-view</artifactId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 3
ambari-views/examples/cluster-view/pom.xml

@@ -19,11 +19,10 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cluster-view</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ambari Cluster View</name>
   <url>http://maven.apache.org</url>
@@ -34,7 +33,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 2
ambari-views/examples/favorite-view/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>favorite-view</artifactId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 3
ambari-views/examples/hello-servlet-view/pom.xml

@@ -19,13 +19,12 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hello-servlet-view</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Hello Servlet View</name>
-  <version>2.0.0.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
@@ -46,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 3
ambari-views/examples/hello-spring-view/pom.xml

@@ -19,13 +19,12 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hello-spring-view</artifactId>
   <packaging>war</packaging>
   <name>Ambari Hello Spring View</name>
-  <version>2.0.0.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
@@ -46,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 3
ambari-views/examples/helloworld-view/pom.xml

@@ -19,13 +19,12 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>helloworld-view</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Hello World View</name>
-  <version>2.0.0.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
@@ -46,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 3 - 4
ambari-views/examples/phone-list-upgrade-view/pom.xml

@@ -19,9 +19,8 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
-  <version>2.1.0.0-SNAPSHOT</version>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>phone-list-upgrade-view</artifactId>
   <packaging>jar</packaging>
@@ -51,7 +50,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
@@ -67,7 +66,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>2.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

+ 2 - 2
ambari-views/examples/phone-list-view/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>phone-list-view</artifactId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 1 - 2
ambari-views/examples/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,6 @@
   <artifactId>ambari-view-examples</artifactId>
   <packaging>pom</packaging>
   <name>Ambari View Examples</name>
-  <version>2.0.0.0-SNAPSHOT</version>
   <modules>
     <module>helloworld-view</module>
     <module>hello-servlet-view</module>

+ 2 - 3
ambari-views/examples/property-validator-view/pom.xml

@@ -19,11 +19,10 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>property-validator-view</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ambari Property Validator View</name>
   <url>http://maven.apache.org</url>
@@ -34,7 +33,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 3
ambari-views/examples/property-view/pom.xml

@@ -19,11 +19,10 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>property-view</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ambari Property View</name>
   <url>http://maven.apache.org</url>
@@ -34,7 +33,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 2
ambari-views/examples/restricted-view/pom.xml

@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>restricted-view</artifactId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 2 - 3
ambari-views/examples/simple-view/pom.xml

@@ -19,11 +19,10 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-view-examples</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>simple-view</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Ambari Simple View</name>
   <url>http://maven.apache.org</url>
@@ -34,7 +33,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>ambari-views</artifactId>
-      <version>[1.7.0.0,)</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>

+ 1 - 2
ambari-views/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-project</artifactId>
-        <version>2.0.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../ambari-project</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,6 @@
     <artifactId>ambari-views</artifactId>
     <packaging>jar</packaging>
     <name>Ambari Views</name>
-    <version>2.0.0.0-SNAPSHOT</version>
     <description>Ambari View interfaces.</description>
     <dependencies>
         <dependency>

+ 1 - 2
ambari-web/pom.xml

@@ -20,14 +20,13 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-project</artifactId>
-        <version>2.0.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../ambari-project</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ambari-web</artifactId>
     <packaging>pom</packaging>
     <name>Ambari Web</name>
-    <version>2.0.0.0-SNAPSHOT</version>
     <description>Ambari Web</description>
     <properties>
         <ambari.dir>${project.parent.parent.basedir}</ambari.dir>

+ 1 - 1
contrib/management-packs/hdf-ambari-mpack/pom.xml

@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.mpacks</groupId>
     <artifactId>ambari-contrib-mpacks</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <build>
     <plugins>

+ 1 - 1
contrib/management-packs/isilon-onefs-mpack/pom.xml

@@ -32,7 +32,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.mpacks</groupId>
     <artifactId>ambari-contrib-mpacks</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <build>
     <plugins>

+ 1 - 1
contrib/management-packs/microsoft-r_mpack/pom.xml

@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.ambari.contrib.mpacks</groupId>
     <artifactId>ambari-contrib-mpacks</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <dependencies>

+ 2 - 3
contrib/management-packs/pom.xml

@@ -19,17 +19,16 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.contrib.mpacks</groupId>
   <artifactId>ambari-contrib-mpacks</artifactId>
   <packaging>pom</packaging>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Ambari Contrib Management Packs</name>
   <properties>
-    <ambari.version>2.0.0.0-SNAPSHOT</ambari.version>
+    <ambari.version>${revision}</ambari.version>
     <ambari.dir>${project.parent.parent.basedir}</ambari.dir>
     <hadoop.version>2.7.1</hadoop.version>
   </properties>

+ 1 - 2
contrib/views/ambari-views-package/pom.xml

@@ -21,12 +21,11 @@
 
   <groupId>org.apache.ambari.contrib.views</groupId>
   <artifactId>ambari-views-package</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Ambari Views Package</name>
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <description>

+ 2 - 3
contrib/views/capacity-scheduler/pom.xml

@@ -19,13 +19,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>capacity-scheduler</artifactId>
-    <version>1.0.0.0-SNAPSHOT</version>
     <name>Capacity Scheduler</name>
 
     <parent>
         <groupId>org.apache.ambari.contrib.views</groupId>
         <artifactId>ambari-contrib-views</artifactId>
-        <version>2.0.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <dependencies>
@@ -85,7 +84,7 @@
         <dependency>
             <groupId>org.apache.ambari.contrib.views</groupId>
             <artifactId>ambari-views-utils</artifactId>
-            <version>2.0.0.0-SNAPSHOT</version>
+            <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>

+ 3 - 4
contrib/views/commons/pom.xml

@@ -22,20 +22,19 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-views-commons</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Ambari View Commons</name>
 
   <parent>
     <artifactId>ambari-contrib-views</artifactId>
     <groupId>org.apache.ambari.contrib.views</groupId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.ambari.contrib.views</groupId>
       <artifactId>ambari-views-utils</artifactId>
-      <version>2.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
 
     <dependency>
@@ -143,4 +142,4 @@
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
   </properties>
-</project>
+</project>

+ 4 - 5
contrib/views/files/pom.xml

@@ -18,13 +18,12 @@
          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>
   <artifactId>files</artifactId>
-  <version>1.0.0.0-SNAPSHOT</version>
   <name>Files</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <dependencies>
     <dependency>
@@ -119,12 +118,12 @@
     <dependency>
       <groupId>org.apache.ambari.contrib.views</groupId>
       <artifactId>ambari-views-utils</artifactId>
-      <version>2.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari.contrib.views</groupId>
       <artifactId>ambari-views-commons</artifactId>
-      <version>2.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -184,7 +183,7 @@
           <yarnVersion>v0.23.2</yarnVersion>
           <workingDirectory>src/main/resources/ui/</workingDirectory>
           <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
-          <!-- setting npm_config_tmp environment variable is a workaround for 
+          <!-- setting npm_config_tmp environment variable is a workaround for
                https://github.com/Medium/phantomjs/issues/673 -->
           <environmentVariables>
             <npm_config_tmp>/tmp/npm_config_tmp</npm_config_tmp>

+ 5 - 6
contrib/views/pig/pom.xml

@@ -18,13 +18,12 @@
          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>
   <artifactId>pig</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Pig</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <dependencies>
@@ -142,18 +141,18 @@
     <dependency>
       <groupId>org.apache.ambari.contrib.views</groupId>
       <artifactId>ambari-views-utils</artifactId>
-      <version>2.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ambari.contrib.views</groupId>
       <artifactId>ambari-views-commons</artifactId>
-      <version>2.0.0.0-SNAPSHOT</version>
+      <version>${revision}</version>
     </dependency>
   </dependencies>
 
   <properties>
     <ambari.dir>${project.parent.parent.parent.basedir}</ambari.dir>
-    <ambari.version>2.0.0.0-SNAPSHOT</ambari.version>
+    <ambari.version>${revision}</ambari.version>
     <ui.directory>${basedir}/src/main/resources/ui/pig-web</ui.directory>
   </properties>
   <build>
@@ -197,7 +196,7 @@
           <yarnVersion>v0.23.2</yarnVersion>
           <workingDirectory>${ui.directory}</workingDirectory>
           <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
-          <!-- setting npm_config_tmp environment variable is a workaround for 
+          <!-- setting npm_config_tmp environment variable is a workaround for
                https://github.com/Medium/phantomjs/issues/673 -->
           <environmentVariables>
             <npm_config_tmp>/tmp/npm_config_tmp</npm_config_tmp>

+ 3 - 4
contrib/views/pom.xml

@@ -19,17 +19,16 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <relativePath>../../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.contrib.views</groupId>
   <artifactId>ambari-contrib-views</artifactId>
   <packaging>pom</packaging>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Ambari Contrib Views</name>
   <properties>
-    <ambari.version>2.0.0.0-SNAPSHOT</ambari.version>
+    <ambari.version>${revision}</ambari.version>
     <ambari.dir>${project.parent.parent.basedir}</ambari.dir>
     <jetty.version>9.3.19.v20170502</jetty.version>
     <hadoop.version>3.1.0</hadoop.version>
@@ -267,7 +266,7 @@
       <dependency>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-views</artifactId>
-        <version>2.0.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

+ 1 - 2
contrib/views/utils/pom.xml

@@ -18,13 +18,12 @@
          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>
   <artifactId>ambari-views-utils</artifactId>
-  <version>2.0.0.0-SNAPSHOT</version>
   <name>Ambari View Utils</name>
 
   <parent>
     <groupId>org.apache.ambari.contrib.views</groupId>
     <artifactId>ambari-contrib-views</artifactId>
-    <version>2.0.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
 
   <dependencies>

+ 4 - 5
contrib/views/wfmanager/pom.xml

@@ -14,19 +14,18 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>wfmanager</artifactId>
 	<groupId>org.apache.ambari.contrib.views</groupId>
-	<version>0.1.0.0-SNAPSHOT</version>
 	<name>WF Manager View</name>
 	<parent>
 		<groupId>org.apache.ambari.contrib.views</groupId>
 		<artifactId>ambari-contrib-views</artifactId>
-		<version>2.0.0.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ambari.contrib.views</groupId>
 			<artifactId>ambari-views-utils</artifactId>
-			<version>2.0.0.0-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ambari</groupId>
@@ -36,7 +35,7 @@
 		<dependency>
 			<groupId>org.apache.ambari.contrib.views</groupId>
 			<artifactId>ambari-views-commons</artifactId>
-			<version>2.0.0.0-SNAPSHOT</version>
+			<version>${revision}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.jersey</groupId>
@@ -144,7 +143,7 @@
 					<yarnVersion>v0.23.2</yarnVersion>
 					<workingDirectory>src/main/resources/ui/</workingDirectory>
 					<npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven>
-                    <!-- setting npm_config_tmp environment variable is a workaround for 
+                    <!-- setting npm_config_tmp environment variable is a workaround for
                      https://github.com/Medium/phantomjs/issues/673 -->
                     <environmentVariables>
                       <npm_config_tmp>/tmp/npm_config_tmp</npm_config_tmp>

+ 93 - 17
pom.xml

@@ -17,11 +17,16 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>21</version>
+  </parent>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Main</name>
-  <version>2.0.0.0-SNAPSHOT</version>
+  <version>${revision}</version>
   <description>Ambari</description>
   <url>http://ambari.apache.org/</url>
   <scm>
@@ -35,6 +40,36 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
+  <mailingLists>
+    <mailingList>
+      <name>Dev</name>
+      <subscribe>dev-subscribe@ambari.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@ambari.apache.org</unsubscribe>
+      <post>dev@ambari.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ambari-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Users</name>
+      <subscribe>users-subscribe@ambari.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@ambari.apache.org</unsubscribe>
+      <post>users@ambari.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ambari-users</archive>
+    </mailingList>
+    <mailingList>
+      <name>Commits</name>
+      <subscribe>commits-subscribe@ambari.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@ambari.apache.org</unsubscribe>
+      <post>commits@ambari.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ambari-commits</archive>
+    </mailingList>
+    <mailingList>
+      <name>Issues</name>
+      <subscribe>issues-subscribe@ambari.apache.org</subscribe>
+      <unsubscribe>issues-unsubscribe@ambari.apache.org</unsubscribe>
+      <post>issues@ambari.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/ambari-issues</archive>
+    </mailingList>
+  </mailingLists>
   <organization>
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org</url>
@@ -44,6 +79,7 @@
     <url>https://issues.apache.org/jira/browse/AMBARI</url>
   </issueManagement>
   <properties>
+    <revision>3.0.0.0-SNAPSHOT</revision>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <clover.license>${user.home}/clover.license</clover.license>
     <buildnumber-maven-plugin-version>1.2</buildnumber-maven-plugin-version>
@@ -57,9 +93,6 @@
     <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
     <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
     <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
-    <distMgmtStagingId>apache.staging.https</distMgmtStagingId>
-    <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName>
-    <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
     <assemblyPhase>package</assemblyPhase> <!-- use -DassemblyPhase=none to skip building tarball, useful when you want purely compile jar -->
     <eclipselink.version>2.6.2</eclipselink.version>
   </properties>
@@ -89,19 +122,6 @@
     </pluginRepository>
   </pluginRepositories>
 
-  <distributionManagement>
-    <repository>
-      <id>${distMgmtStagingId}</id>
-      <name>${distMgmtStagingName}</name>
-      <url>${distMgmtStagingUrl}</url>
-    </repository>
-    <snapshotRepository>
-      <id>${distMgmtSnapshotsId}</id>
-      <name>${distMgmtSnapshotsName}</name>
-      <url>${distMgmtSnapshotsUrl}</url>
-    </snapshotRepository>
-  </distributionManagement>
-
   <repositories>
     <repository>
       <id>oss.sonatype.org</id>
@@ -312,6 +332,8 @@
             <exclude>ambari-web/node_modules/**</exclude>
 
             <!--Contributions-->
+            <exclude>contrib/**/bower_components/**</exclude>
+            <exclude>contrib/**/dist/**</exclude>
             <exclude>contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/hooks/before-START/files/fast-hdfs-resource.jar</exclude>
             <exclude>contrib/ambari-scom/management-pack/Hadoop_MP/**</exclude>
             <exclude>contrib/addons/test/dataServices/jmx/data/cluster_configuration.json.nohbase</exclude>
@@ -408,6 +430,60 @@
           </filesets>
         </configuration>
       </plugin>
+
+      <!--
+      Required when using the ${revision} placeholder to generate target/.flattened-pom.xml
+      See: https://maven.apache.org/maven-ci-friendly.html
+      -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+        <version>1.0.1</version>
+        <configuration>
+          <flattenMode>oss</flattenMode>
+          <updatePomFile>true</updatePomFile>
+          <outputDirectory>${project.build.directory}</outputDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <id>flatten</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>flatten</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>flatten.clean</id>
+            <phase>clean</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M2</version>
+        <executions>
+          <execution>
+            <id>enforce-versions</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.5.0</version>
+                </requireMavenVersion>
+                <requireJavaVersion>
+                  <version>1.8</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <profiles>

+ 2 - 2
setup.py

@@ -51,7 +51,7 @@ def create_package_dir_map():
 
   return package_dirs
 
-__version__ = "2.0.0.0-SNAPSHOT"
+__version__ = "3.0.0.0-SNAPSHOT"
 
 def get_version():
   """
@@ -91,7 +91,7 @@ Example usage:
   python setup.py sdist -d "my/dist/location" upload -r "http://localhost:8080"
 
 Installing from pip:
-- pip install --extra-index-url=http://localhost:8080 ambari-python==2.7.1.0  // 2.0.0.0-SNAPSHOT is the snapshot version
+- pip install --extra-index-url=http://localhost:8080 ambari-python==2.7.1.0  // 3.0.0.0-SNAPSHOT is the snapshot version
 """
 setup(
   name = "ambari-python",