diff --git a/discovery-client/pom.xml b/discovery-client/pom.xml index bfa5fe9..2e1275f 100644 --- a/discovery-client/pom.xml +++ b/discovery-client/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 com.comcast.tvx discovery - 1.2-SNAPSHOT + 1.2.0 discovery-client @@ -58,7 +57,6 @@ maven-zookeeper-plugin - org.apache.maven.plugins maven-failsafe-plugin 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 index af14b92..95d5557 100644 --- 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 index 61f7fd9..33c79c9 100644 --- a/ha-configurator/pom.xml +++ b/ha-configurator/pom.xml @@ -1,12 +1,11 @@ - + 4.0.0 com.comcast.tvx discovery - 1.2-SNAPSHOT + 1.2.0 ha-configurator diff --git a/pom.xml b/pom.xml index 0de0eb4..712c845 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.comcast.tvx discovery Discovery Parent POM - 1.2-SNAPSHOT + 1.2.0 pom @@ -18,6 +18,7 @@ discovery-client ha-configurator + reagent @@ -29,6 +30,7 @@ localhost 2192 + skipTests @@ -52,22 +54,57 @@ + - rpm.build + integration-tests - - linux - + true - - reagent - + + + + + com.objectdriven.maven + maven-zookeeper-plugin + 1.0-SNAPSHOT + + ${zookeeper.port} + + + + start-zookeeper + pre-integration-test + + start + + + + stop-zookeeper + post-integration-test + + stop + + + + + + + + + + + release-profile + + true + + + org.codehaus.mojo rpm-maven-plugin @@ -89,30 +126,17 @@ /opt + - com.objectdriven.maven - maven-zookeeper-plugin - 1.0-SNAPSHOT + com.atlassian.maven.plugins + maven-jgitflow-plugin + 1.0-alpha27p1 - ${zookeeper.port} + true + true - - - start-zookeeper - pre-integration-test - - start - - - - stop-zookeeper - post-integration-test - - stop - - - + diff --git a/reagent/pom.xml b/reagent/pom.xml index 1a3689b..ddacc9b 100644 --- a/reagent/pom.xml +++ b/reagent/pom.xml @@ -6,7 +6,7 @@ com.comcast.tvx discovery - 1.2-SNAPSHOT + 1.2.0 reagent @@ -24,90 +24,122 @@ - - - - org.codehaus.mojo - rpm-maven-plugin - - - java >= 1.6.0 - facter - - - - /opt/${rpm.dirname}/lib - - - - /opt/${rpm.dirname} - - - /opt/${rpm.dirname}/bin - 755 - - - ${basedir}/src/main/rpmroot/bin - - - - - /opt/${rpm.dirname}/conf - true - - - ${basedir}/src/main/rpmroot/conf - - - - - /etc/rc.d/init.d - false - 755 - - - ${basedir}/src/main/etc/init.d/${project.artifactId} - - - - - /etc/sysconfig - false - true - - - ${basedir}/src/main/etc/sysconfig/${project.artifactId} - - - - - /var/log/${project.artifactId} - 755 - ${project.artifactId} - ${project.artifactId} - - - /var/run/${project.artifactId} - 755 - ${project.artifactId} - ${project.artifactId} - - - - src/main/scripts/pre-install.sh - - - src/main/scripts/post-install.sh - - - src/main/scripts/pre-remove.sh - - - src/main/scripts/post-remove.sh - - - - - + + + + rpm.skip + + true + + + + + org.codehaus.mojo + rpm-maven-plugin + + + none + + + + + + + + + rpm.build + + + linux + + + + + + org.codehaus.mojo + rpm-maven-plugin + + + java >= 1.6.0 + facter + + + + /opt/${rpm.dirname}/lib + + + + /opt/${rpm.dirname} + + + /opt/${rpm.dirname}/bin + 755 + + + ${basedir}/src/main/rpmroot/bin + + + + + /opt/${rpm.dirname}/conf + true + + + ${basedir}/src/main/rpmroot/conf + + + + + /etc/rc.d/init.d + false + 755 + + + ${basedir}/src/main/etc/init.d/${project.artifactId} + + + + + /etc/sysconfig + false + true + + + ${basedir}/src/main/etc/sysconfig/${project.artifactId} + + + + + /var/log/${project.artifactId} + 755 + ${project.artifactId} + ${project.artifactId} + + + /var/run/${project.artifactId} + 755 + ${project.artifactId} + ${project.artifactId} + + + + src/main/scripts/pre-install.sh + + + src/main/scripts/post-install.sh + + + src/main/scripts/pre-remove.sh + + + src/main/scripts/post-remove.sh + + + + + + + +