Merge branch 'release/1.2.0'

Comcast · Mar 19, 2014 · 91acdb7 · 91acdb7
2 parents 76f123b + 6d80b82
commit 91acdb7
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 124 deletions.
diff --git a/discovery-client/pom.xml b/discovery-client/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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">
+<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>com.comcast.tvx</groupId>
     <artifactId>discovery</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
 
   <artifactId>discovery-client</artifactId>
@@ -58,7 +57,6 @@
         <artifactId>maven-zookeeper-plugin</artifactId>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
           <systemPropertyVariables>

diff --git a/discovery-client/src/main/java/com/comcast/tvx/cloud/RegistrationMain.java b/discovery-client/src/main/java/com/comcast/tvx/cloud/RegistrationMain.java
@@ -33,8 +33,8 @@ public class RegistrationMain {
     @Argument(alias = "z", description = "ZooKeeper connection string", required = true)
     private static String zooKeeperConnectionString = null;
 
-    @Argument(alias = "r", description = "Registration root path", required = false)
-    private static String registrationRoot = Constants.DEFAULT_REGISTRATION_ROOT;
+    @Argument(alias = "p", description = "Registration root path", required = false)
+    private static String registrationPath = Constants.DEFAULT_REGISTRATION_ROOT;
 
     @Argument(alias = "i", description = "IP of service to register", required = true)
     private static String ip = null;
@@ -75,7 +75,7 @@ public static void main(String[] args) throws Exception {
             return;
         }
 
-        String basePath = new StringBuilder().append(registrationRoot).append("/").append(region).append("/")
+        String basePath = new StringBuilder().append(registrationPath).append("/").append(region).append("/")
                 .append(availabilityZone).toString();
         final CuratorFramework curatorFramework = CuratorClient.getCuratorFramework(zooKeeperConnectionString);
         final RegistrationClient registrationClient = new RegistrationClient(curatorFramework, basePath, flavor, ip,

diff --git a/ha-configurator/pom.xml b/ha-configurator/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>com.comcast.tvx</groupId>
     <artifactId>discovery</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
 
   <artifactId>ha-configurator</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>com.comcast.tvx</groupId>
   <artifactId>discovery</artifactId>
   <name>Discovery Parent POM</name>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <packaging>pom</packaging>
 
   <developers>
@@ -18,6 +18,7 @@
   <modules>
     <module>discovery-client</module>
     <module>ha-configurator</module>
+    <module>reagent</module>
   </modules>
 
   <scm>
@@ -29,6 +30,7 @@
   <properties>
     <zookeeper.host>localhost</zookeeper.host>
     <zookeeper.port>2192</zookeeper.port>
+    <releaseProfiles>skipTests</releaseProfiles>
   </properties>
 
   <dependencyManagement>
@@ -52,22 +54,57 @@
   </dependencyManagement>
 
   <profiles>
+
     <profile>
-      <id>rpm.build</id>
+      <id>integration-tests</id>
       <activation>
-        <os>
-          <family>linux</family>
-        </os>
+        <activeByDefault>true</activeByDefault>
       </activation>
-      <modules>
-        <module>reagent</module>
-      </modules>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>com.objectdriven.maven</groupId>
+              <artifactId>maven-zookeeper-plugin</artifactId>
+              <version>1.0-SNAPSHOT</version>
+              <configuration>
+                <port>${zookeeper.port}</port>
+              </configuration>
+              <executions>
+                <execution>
+                  <id>start-zookeeper</id>
+                  <phase>pre-integration-test</phase>
+                  <goals>
+                    <goal>start</goal>
+                  </goals>
+                </execution>
+                <execution>
+                  <id>stop-zookeeper</id>
+                  <phase>post-integration-test</phase>
+                  <goals>
+                    <goal>stop</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+
+    <profile>
+      <id>release-profile</id>
+      <properties>
+        <skipTests>true</skipTests>
+      </properties>
     </profile>
+
   </profiles>
 
   <build>
     <pluginManagement>
       <plugins>
+
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>rpm-maven-plugin</artifactId>
@@ -89,30 +126,17 @@
             <prefix>/opt</prefix>
           </configuration>
         </plugin>
+
         <plugin>
-          <groupId>com.objectdriven.maven</groupId>
-          <artifactId>maven-zookeeper-plugin</artifactId>
-          <version>1.0-SNAPSHOT</version>
+          <groupId>com.atlassian.maven.plugins</groupId>
+          <artifactId>maven-jgitflow-plugin</artifactId>
+          <version>1.0-alpha27p1</version>
           <configuration>
-            <port>${zookeeper.port}</port>
+            <allowSnapshots>true</allowSnapshots>
+            <autoVersionSubmodules>true</autoVersionSubmodules>
           </configuration>
-          <executions>
-            <execution>
-              <id>start-zookeeper</id>
-              <phase>pre-integration-test</phase>
-              <goals>
-                <goal>start</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>stop-zookeeper</id>
-              <phase>post-integration-test</phase>
-              <goals>
-                <goal>stop</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
+
       </plugins>
     </pluginManagement>
   </build>