diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..fba5663
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,7 @@
+
+Comcast Discovery Packages - discovery-client, reagent, ha-configurator.
+
+Copyright 2014 Comcast Corporation or its affiliates. All Rights Reserved.
+
+This product includes software developed by Comcast Corporation (http://www.comcast.com/).
+
diff --git a/discovery-client/pom.xml b/discovery-client/pom.xml
index 2e1275f..142ca0c 100644
--- a/discovery-client/pom.xml
+++ b/discovery-client/pom.xml
@@ -5,7 +5,7 @@
com.comcast.tvx
discovery
- 1.2.0
+ 1.2.4
discovery-client
@@ -23,25 +23,31 @@
org.slf4j
slf4j-api
-
- org.slf4j
- slf4j-log4j12
-
org.apache.curator
curator-recipes
- 2.1.0-incubating
+ 2.4.2
org.apache.curator
curator-x-discovery-server
- 2.1.0-incubating
+ 2.4.2
com.github.spullara.cli-parser
cli-parser
1.1
+
+ log4j
+ log4j
+ test
+
+
+ org.slf4j
+ slf4j-log4j12
+ test
+
org.testng
testng
@@ -50,22 +56,4 @@
-
-
-
- com.objectdriven.maven
- maven-zookeeper-plugin
-
-
- maven-failsafe-plugin
-
-
- ${zookeeper.host}
- ${zookeeper.port}
-
-
-
-
-
-
diff --git a/discovery-client/src/main/java/com/comcast/tvx/cloud/CuratorClient.java b/discovery-client/src/main/java/com/comcast/tvx/cloud/CuratorClient.java
index b888bd0..c6da9e1 100644
--- a/discovery-client/src/main/java/com/comcast/tvx/cloud/CuratorClient.java
+++ b/discovery-client/src/main/java/com/comcast/tvx/cloud/CuratorClient.java
@@ -34,22 +34,26 @@ public class CuratorClient {
private static Logger log = LoggerFactory.getLogger(CuratorClient.class);
+ public static final int DEFAULT_MAX_SLEEP_MS = 60000;
+
/**
* Gets the curator framework.
*
- * @param zooKeeperConnectionString the zoo keeper connection string
- * @param basePath the base path
- *
+ * @param zkConnectionString the zoo keeper connection string
* @return the curator framework
*/
- public static CuratorFramework getCuratorFramework(String zooKeeperConnectionString) {
-
- CuratorFramework curatorFramework =
- CuratorFrameworkFactory.builder().connectionTimeoutMs(10 * 1000).retryPolicy(new ExponentialBackoffRetry(
- 10,
- 20)).connectString(
- zooKeeperConnectionString).build();
+ public static CuratorFramework getCuratorFramework(String zkConnectionString) {
+ return getCuratorFramework(getCuratorBuilder(zkConnectionString));
+ }
+ /**
+ * Get a framework using a builder argument.
+ *
+ * @param builder The builder to use.
+ * @return the curator framework
+ */
+ public static CuratorFramework getCuratorFramework(CuratorFrameworkFactory.Builder builder){
+ CuratorFramework curatorFramework = builder.build();
curatorFramework.start();
try {
@@ -61,6 +65,19 @@ public static CuratorFramework getCuratorFramework(String zooKeeperConnectionStr
return curatorFramework;
}
+ /**
+ * Get a builder object and allow user to override specific parameters.
+ *
+ * @param zkConnectionString Zookeeper connection string.
+ * @return A builder.
+ */
+ public static CuratorFrameworkFactory.Builder getCuratorBuilder(String zkConnectionString) {
+ return CuratorFrameworkFactory.builder()
+ .connectionTimeoutMs(10 * 1000)
+ .retryPolicy(new ExponentialBackoffRetry(10, 20, DEFAULT_MAX_SLEEP_MS))
+ .connectString(zkConnectionString);
+ }
+
public static void registerForChanges(CuratorFramework curatorFramework,
final RegistrationChangeHandler handler,
String... basePaths) {
diff --git a/discovery-client/src/main/java/com/comcast/tvx/cloud/DiscoveryClient.java b/discovery-client/src/main/java/com/comcast/tvx/cloud/DiscoveryClient.java
index 220fc5d..4c9c553 100644
--- a/discovery-client/src/main/java/com/comcast/tvx/cloud/DiscoveryClient.java
+++ b/discovery-client/src/main/java/com/comcast/tvx/cloud/DiscoveryClient.java
@@ -29,7 +29,8 @@
import org.apache.curator.framework.imps.CuratorFrameworkState;
import org.apache.curator.x.discovery.ServiceDiscovery;
import org.apache.curator.x.discovery.ServiceInstance;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Client used to query the central server for registered services.
@@ -46,7 +47,7 @@ public class DiscoveryClient {
private List filters;
/** The logger. */
- private Logger logger = Logger.getLogger(DiscoveryClient.class);
+ private Logger logger = LoggerFactory.getLogger(DiscoveryClient.class);
private ServiceDiscoveryManager discoveryManager ;
diff --git a/discovery-client/src/main/java/com/comcast/tvx/cloud/QueueUtils.java b/discovery-client/src/main/java/com/comcast/tvx/cloud/QueueUtils.java
index 454fc6c..28ac826 100644
--- a/discovery-client/src/main/java/com/comcast/tvx/cloud/QueueUtils.java
+++ b/discovery-client/src/main/java/com/comcast/tvx/cloud/QueueUtils.java
@@ -19,14 +19,15 @@
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.recipes.queue.DistributedQueue;
import org.apache.curator.framework.recipes.queue.QueueBuilder;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
* Small helper to hide some noise and provide pleasing semantics to queue users
*/
public class QueueUtils {
- private static Logger log = Logger.getLogger(QueueUtils.class);
+ private static Logger log = LoggerFactory.getLogger(QueueUtils.class);
public static DistributedQueue getQueue(CuratorFramework curatorFramework, String queueName,
PathEventConsumer consumer) throws Exception {
diff --git a/discovery-client/src/main/java/com/comcast/tvx/cloud/RegistrationClient.java b/discovery-client/src/main/java/com/comcast/tvx/cloud/RegistrationClient.java
index e1ba0cf..e012eff 100644
--- a/discovery-client/src/main/java/com/comcast/tvx/cloud/RegistrationClient.java
+++ b/discovery-client/src/main/java/com/comcast/tvx/cloud/RegistrationClient.java
@@ -21,6 +21,7 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import com.google.common.base.Throwables;
@@ -58,6 +59,9 @@ public final class RegistrationClient {
/** Map of discovery objects and instances since there is a one to one correlation. */
private Map, ServiceInstance> discoveryMap;
+ /** Maintain client state of what was called by clients of this object. */
+ private AtomicBoolean active = new AtomicBoolean(false);
+
/** The log. */
private Logger log = LoggerFactory.getLogger(this.getClass());
@@ -102,8 +106,11 @@ public RegistrationClient(CuratorFramework curatorFramework, String basePath, St
*/
public RegistrationClient advertiseAvailability() {
- try {
+ if (active.getAndSet(true)) {
+ throw new IllegalStateException("This client instance is already advertising.");
+ }
+ try {
if (curatorFramework.getState() != CuratorFrameworkState.STARTED) {
curatorFramework.start();
}
@@ -122,15 +129,12 @@ public RegistrationClient advertiseAvailability() {
Collection> candidates = discovery.queryForInstances(serviceName);
for (ServiceInstance worker : candidates) {
-
if ((worker.getAddress().equals(service.getAddress())) && (worker.getPort() == port)) {
log.error("An instance of " + service + " already exists at: " +
service.getAddress() + ":" + port);
throw new IllegalStateException("Duplicate service being registered. for service: " +
serviceName + " at: " + regPath);
}
-
- continue;
}
log.debug("registering service: " + serviceName);
@@ -139,6 +143,8 @@ public RegistrationClient advertiseAvailability() {
log.info("registered service: " + serviceName);
}
+ } catch (RuntimeException rte) {
+ throw rte;
} catch (Exception e) {
throw Throwables.propagate(e);
}
@@ -173,6 +179,8 @@ public void verifyRegistrations() throws Exception {
*/
public RegistrationClient deAdvertiseAvailability() {
+ active.set(false);
+
for (Map.Entry, ServiceInstance> entry : discoveryMap.entrySet()) {
ServiceInstance instance = entry.getValue();
diff --git a/discovery-client/src/test/java/com/comcast/tvx/cloud/AbstractITBase.java b/discovery-client/src/test/java/com/comcast/tvx/cloud/AbstractITBase.java
index 6b5d611..1a05b37 100644
--- a/discovery-client/src/test/java/com/comcast/tvx/cloud/AbstractITBase.java
+++ b/discovery-client/src/test/java/com/comcast/tvx/cloud/AbstractITBase.java
@@ -26,7 +26,9 @@
public abstract class AbstractITBase {
/** The zk connection string. */
- String zkConnectionString = System.getProperty("zookeeper.host") + ":" + System.getProperty("zookeeper.port");
+ String zkConnectionString = System.getProperty("zookeeper.host", "localhost")
+ + ":" + System.getProperty("zookeeper.port", "2181");
+
/** The logger. */
Logger log = LoggerFactory.getLogger(this.getClass());
diff --git a/discovery-client/src/test/java/com/comcast/tvx/cloud/RegistrationClientIT.java b/discovery-client/src/test/java/com/comcast/tvx/cloud/RegistrationClientIT.java
index 5251f12..be68812 100644
--- a/discovery-client/src/test/java/com/comcast/tvx/cloud/RegistrationClientIT.java
+++ b/discovery-client/src/test/java/com/comcast/tvx/cloud/RegistrationClientIT.java
@@ -111,7 +111,8 @@ public void testClusterRegistrationOfSameType() throws Exception {
/**
* Test should enforce unique name address port.
*/
- @Test(expectedExceptions = RuntimeException.class)
+ @Test(expectedExceptions = RuntimeException.class,
+ expectedExceptionsMessageRegExp = "^Duplicate service being registered.*")
public void testShouldEnforceUniqueNameAddressPort() {
List workers = new ArrayList();
@@ -126,12 +127,18 @@ public void testShouldEnforceUniqueNameAddressPort() {
}
}
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testDuplicateAdvertisement() {
+ RegistrationClient client = new RegistrationClient(getCurator(), basePath, "y", "192.168.1.101", "dayview:10022");
+ client.advertiseAvailability();
+ client.advertiseAvailability();
+ }
+
/**
* Shutdown.
*/
@AfterClass
public void shutdown() {
-
if (curatorFramework != null) {
curatorFramework.close();
}
diff --git a/ha-configurator/pom.xml b/ha-configurator/pom.xml
index 33c79c9..6b93f79 100644
--- a/ha-configurator/pom.xml
+++ b/ha-configurator/pom.xml
@@ -5,7 +5,7 @@
com.comcast.tvx
discovery
- 1.2.0
+ 1.2.4
ha-configurator
@@ -22,10 +22,6 @@
org.slf4j
slf4j-api
-
- org.slf4j
- slf4j-log4j12
-
com.comcast.tvx
discovery-client
@@ -45,6 +41,16 @@
guava
15.0
+
+ log4j
+ log4j
+ runtime
+
+
+ org.slf4j
+ slf4j-log4j12
+ runtime
+
org.testng
testng
@@ -87,11 +93,7 @@
/opt/${rpm.dirname}/lib
-
-
-
-
-
+
@@ -190,13 +192,4 @@
-
-
-
- com.objectdriven.maven
- maven-zookeeper-plugin
-
-
-
-
diff --git a/ha-configurator/src/test/java/com/comcast/tvx/haproxy/HAConfiguratorIT.java b/ha-configurator/src/test/java/com/comcast/tvx/haproxy/HAConfiguratorIT.java
index 0de33ce..d035b2b 100644
--- a/ha-configurator/src/test/java/com/comcast/tvx/haproxy/HAConfiguratorIT.java
+++ b/ha-configurator/src/test/java/com/comcast/tvx/haproxy/HAConfiguratorIT.java
@@ -37,7 +37,7 @@
public class HAConfiguratorIT {
- Logger logger = LoggerFactory.getLogger(HAConfiguratorIT.class);
+ Logger log = LoggerFactory.getLogger(this.getClass());
private static final String region = "region1";
private static final String availabilityZone = "zonedOut";
@@ -49,7 +49,10 @@ public class HAConfiguratorIT {
private List clients = new ArrayList();
private String getConnectionString() {
- return System.getProperty("zookeeper.connection", "localhost:2181");
+ String conn = System.getProperty("zookeeper.host", "localhost")
+ + ":" + System.getProperty("zookeeper.port", "2181");
+ log.debug("ZK connection string: " + conn);
+ return conn;
}
@Test(groups = { "scaleUp" })
@@ -60,7 +63,6 @@ public void testScaleUp() throws InterruptedException {
.advertiseAvailability());
}
Thread.sleep(3000);
-
}
@Test(dependsOnGroups = "scaleUp")
@@ -76,7 +78,7 @@ public void testScaleDown() throws InterruptedException {
for (Integer key : mappings.keySet()) {
result = key + ":" + mappings.get(key);
}
- logger.debug(result);
+ log.debug(result);
HAProxyService haproxy = mock(HAProxyServiceController.class);
when(haproxy.reload()).thenReturn(0);
diff --git a/pom.xml b/pom.xml
index 712c845..7b74f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.comcast.tvx
discovery
Discovery Parent POM
- 1.2.0
+ 1.2.4
pom
@@ -28,13 +28,20 @@
+ UTF-8
+ UTF-8
+ skip-it
localhost
2192
- skipTests
+
+ log4j
+ log4j
+ 1.2.16
+
org.slf4j
slf4j-api
@@ -61,42 +68,59 @@
true
-
-
-
- com.objectdriven.maven
- maven-zookeeper-plugin
- 1.0-SNAPSHOT
-
- ${zookeeper.port}
-
-
-
- start-zookeeper
- pre-integration-test
-
- start
-
-
-
- stop-zookeeper
- post-integration-test
-
- stop
-
-
-
-
-
-
+
+
+
+ com.objectdriven.maven
+ maven-zookeeper-plugin
+ 1.0-TVX1
+
+ ${zookeeper.port}
+
+
+
+ start-zookeeper
+ pre-integration-test
+
+ start
+
+
+
+ stop-zookeeper
+ post-integration-test
+
+ stop
+
+
+
+
+
+
+ maven-failsafe-plugin
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+ ${zookeeper.host}
+ ${zookeeper.port}
+
+
+
+
+
- release-profile
-
- true
-
+
+
+ skip-it
@@ -110,7 +134,6 @@
rpm-maven-plugin
2.1-alpha-2
- true
AutoReqProv: no
@@ -134,9 +157,17 @@
true
true
+
+ 1.2.patch
+
+
+ maven-failsafe-plugin
+ 2.13
+
+
diff --git a/reagent/pom.xml b/reagent/pom.xml
index ddacc9b..55a5397 100644
--- a/reagent/pom.xml
+++ b/reagent/pom.xml
@@ -6,12 +6,12 @@
com.comcast.tvx
discovery
- 1.2.0
+ 1.2.4
reagent
Registration Agent RPM
- rpm
+ pom
${project.artifactId}
@@ -26,26 +26,6 @@
-
- rpm.skip
-
- true
-
-
-
-
- org.codehaus.mojo
- rpm-maven-plugin
-
-
- none
-
-
-
-
-
-
-
rpm.build
@@ -58,6 +38,13 @@
org.codehaus.mojo
rpm-maven-plugin
+
+
+
+ attached-rpm
+
+
+
java >= 1.6.0