Repository: curator Updated Branches: refs/heads/master 3c468b235 -> 6784f8074
Upgrade to latest versions of dependencies/plugins (include ZK 3.4.6), fix longstanding problems where JUnit Asserts were accidentally used, removed some bogus deps, fixed up the poms, etc. Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/426db3d3 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/426db3d3 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/426db3d3 Branch: refs/heads/master Commit: 426db3d355ef69d89a8c2b3d9f918c9f4be5989c Parents: bfdef2d Author: randgalt <randg...@apache.org> Authored: Sun Mar 30 12:54:08 2014 -0500 Committer: randgalt <randg...@apache.org> Committed: Sun Mar 30 12:54:08 2014 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 1 - .../curator/TestSessionFailRetryLoop.java | 2 +- curator-examples/pom.xml | 6 - curator-framework/pom.xml | 1 - curator-recipes/pom.xml | 1 - .../framework/client/TestBackgroundStates.java | 7 +- ...estResetConnectionWithBackgroundFailure.java | 14 +- .../locks/TestInterProcessSemaphoreCluster.java | 4 +- .../locks/TestLockCleanlinessWithFaults.java | 4 +- .../framework/recipes/locks/TestReaper.java | 11 +- .../TestPersistentEphemeralNodeListener.java | 7 +- .../queue/TestBoundedDistributedQueue.java | 6 +- .../recipes/queue/TestQueueSharder.java | 6 +- curator-test/pom.xml | 3 - curator-x-discovery-server/pom.xml | 24 -- .../contexts/GenericDiscoveryContext.java | 20 +- .../server/contexts/MapDiscoveryContext.java | 4 +- .../server/jetty_jersey/TestMapsWithJersey.java | 2 +- .../TestObjectPayloadWithJersey.java | 34 +-- .../jetty_jersey/TestStringsWithJersey.java | 18 +- .../jetty_resteasy/TestStringsWithRestEasy.java | 2 +- curator-x-discovery/pom.xml | 2 - .../apache/curator/x/discovery/TestUriSpec.java | 2 +- pom.xml | 273 +++++++++++++++---- 24 files changed, 289 insertions(+), 165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-client/pom.xml ---------------------------------------------------------------------- diff --git a/curator-client/pom.xml b/curator-client/pom.xml index eabb135..5fd7d67 100644 --- a/curator-client/pom.xml +++ b/curator-client/pom.xml @@ -27,7 +27,6 @@ <version>2.4.2-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> <version>2.4.2-SNAPSHOT</version> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java ---------------------------------------------------------------------- diff --git a/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java b/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java index e209e40..f3b2e4e 100644 --- a/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java +++ b/curator-client/src/test/java/org/apache/curator/TestSessionFailRetryLoop.java @@ -22,7 +22,7 @@ import org.apache.curator.utils.CloseableUtils; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.KillSession; import org.apache.curator.test.Timing; -import junit.framework.Assert; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-examples/pom.xml ---------------------------------------------------------------------- diff --git a/curator-examples/pom.xml b/curator-examples/pom.xml index e29d98a..9fb4bb3 100644 --- a/curator-examples/pom.xml +++ b/curator-examples/pom.xml @@ -48,11 +48,5 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-framework/pom.xml ---------------------------------------------------------------------- diff --git a/curator-framework/pom.xml b/curator-framework/pom.xml index 1bac9cd..162e557 100644 --- a/curator-framework/pom.xml +++ b/curator-framework/pom.xml @@ -27,7 +27,6 @@ <version>2.4.2-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> <version>2.4.2-SNAPSHOT</version> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/pom.xml ---------------------------------------------------------------------- diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml index 3c290f2..5fe9a31 100644 --- a/curator-recipes/pom.xml +++ b/curator-recipes/pom.xml @@ -27,7 +27,6 @@ <version>2.4.2-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> <version>2.4.2-SNAPSHOT</version> <packaging>bundle</packaging> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java index cb186fc..8cfa342 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestBackgroundStates.java @@ -20,7 +20,6 @@ package org.apache.curator.framework.client; import com.google.common.collect.Queues; -import com.google.common.io.Closeables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -30,7 +29,7 @@ import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.TestingServer; import org.apache.curator.test.Timing; -import org.apache.curator.utils.DebugUtils; +import org.apache.curator.utils.CloseableUtils; import org.testng.Assert; import org.testng.annotations.Test; import java.util.concurrent.BlockingQueue; @@ -90,7 +89,7 @@ public class TestBackgroundStates extends BaseClassForTests } finally { - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(client); } } @@ -133,7 +132,7 @@ public class TestBackgroundStates extends BaseClassForTests } finally { - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(client); } } http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java index e634a6d..5b6a5fa 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/client/TestResetConnectionWithBackgroundFailure.java @@ -19,7 +19,6 @@ package org.apache.curator.framework.client; -import com.google.common.io.Closeables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -31,15 +30,24 @@ import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.TestingServer; import org.apache.curator.test.Timing; +import org.apache.curator.utils.CloseableUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; public class TestResetConnectionWithBackgroundFailure extends BaseClassForTests { private final Logger log = LoggerFactory.getLogger(getClass()); + @BeforeMethod + @Override + public void setup() throws Exception + { + super.setup(); + } + @Test public void testConnectionStateListener() throws Exception { @@ -96,8 +104,8 @@ public class TestResetConnectionWithBackgroundFailure extends BaseClassForTests } finally { - Closeables.closeQuietly(selector); - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(selector); + CloseableUtils.closeQuietly(client); } } http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java index b3f7a25..2aa8a72 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestInterProcessSemaphoreCluster.java @@ -19,7 +19,6 @@ package org.apache.curator.framework.recipes.locks; import com.google.common.collect.Lists; -import org.apache.curator.utils.CloseableUtils; import org.apache.curator.ensemble.EnsembleProvider; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -29,7 +28,8 @@ import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.curator.test.InstanceSpec; import org.apache.curator.test.TestingCluster; import org.apache.curator.test.Timing; -import junit.framework.Assert; +import org.apache.curator.utils.CloseableUtils; +import org.testng.Assert; import org.testng.annotations.Test; import java.io.IOException; import java.util.Iterator; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java index b1b9c78..9843848 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestLockCleanlinessWithFaults.java @@ -18,13 +18,13 @@ */ package org.apache.curator.framework.recipes.locks; -import org.apache.curator.utils.CloseableUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; import org.apache.curator.retry.RetryNTimes; -import junit.framework.Assert; +import org.apache.curator.utils.CloseableUtils; import org.apache.zookeeper.KeeperException; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.List; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java index b11bc8b..0de78fc 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/locks/TestReaper.java @@ -18,8 +18,6 @@ */ package org.apache.curator.framework.recipes.locks; -import org.apache.curator.utils.CloseableUtils; -import junit.framework.Assert; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -28,8 +26,10 @@ import org.apache.curator.framework.recipes.leader.LeaderSelectorListener; import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.Timing; +import org.apache.curator.utils.CloseableUtils; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.data.Stat; +import org.testng.Assert; import org.testng.annotations.Test; import java.io.IOException; import java.util.Queue; @@ -103,7 +103,6 @@ public class TestReaper extends BaseClassForTests Timing timing = new Timing(); Reaper reaper = null; - Future<Void> watcher = null; CuratorFramework client = makeClient(timing, null); try { @@ -176,10 +175,6 @@ public class TestReaper extends BaseClassForTests } finally { - if ( watcher != null ) - { - watcher.cancel(true); - } CloseableUtils.closeQuietly(reaper); CloseableUtils.closeQuietly(client); } @@ -423,7 +418,7 @@ public class TestReaper extends BaseClassForTests timing.sleepABit(); Stat stat = client.checkExists().forPath("/a/b"); - Assert.assertNull("Child qty: " + ((stat != null) ? stat.getNumChildren() : 0), stat); + Assert.assertNull(stat, "Child qty: " + ((stat != null) ? stat.getNumChildren() : 0)); } finally { http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java index b97ba41..82d5876 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/nodes/TestPersistentEphemeralNodeListener.java @@ -19,8 +19,6 @@ package org.apache.curator.framework.recipes.nodes; -import com.google.common.collect.Lists; -import com.google.common.io.Closeables; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -29,10 +27,9 @@ import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.TestingServer; import org.apache.curator.test.Timing; +import org.apache.curator.utils.CloseableUtils; import org.testng.Assert; -import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; -import java.util.Collection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -88,7 +85,7 @@ public class TestPersistentEphemeralNodeListener extends BaseClassForTests } finally { - Closeables.closeQuietly(client); + CloseableUtils.closeQuietly(client); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java index 6662b7d..1acb051 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestBoundedDistributedQueue.java @@ -18,16 +18,16 @@ */ package org.apache.curator.framework.recipes.queue; -import org.apache.curator.utils.CloseableUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.Timing; -import junit.framework.Assert; +import org.apache.curator.utils.CloseableUtils; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Arrays; import java.util.List; @@ -180,7 +180,7 @@ public class TestBoundedDistributedQueue extends BaseClassForTests for ( int count : counts ) { - Assert.assertTrue(counts.toString(), count <= (MAX_ITEMS * SLOP_FACTOR)); + Assert.assertTrue(count <= (MAX_ITEMS * SLOP_FACTOR), counts.toString()); } } finally http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java ---------------------------------------------------------------------- diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java index 78c833e..b82ebbc 100644 --- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java +++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/queue/TestQueueSharder.java @@ -19,7 +19,7 @@ package org.apache.curator.framework.recipes.queue; import com.google.common.collect.Sets; -import org.apache.curator.utils.CloseableUtils; +import org.apache.commons.math.stat.descriptive.SummaryStatistics; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.BaseClassForTests; @@ -27,8 +27,8 @@ import org.apache.curator.framework.state.ConnectionState; import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryOneTime; import org.apache.curator.test.Timing; -import junit.framework.Assert; -import org.apache.commons.math.stat.descriptive.SummaryStatistics; +import org.apache.curator.utils.CloseableUtils; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Set; import java.util.concurrent.CountDownLatch; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-test/pom.xml ---------------------------------------------------------------------- diff --git a/curator-test/pom.xml b/curator-test/pom.xml index a59f082..83d3329 100644 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@ -27,7 +27,6 @@ <version>2.4.2-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> <version>2.4.2-SNAPSHOT</version> @@ -39,13 +38,11 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.15.0-GA</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> - <version>2.2</version> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/pom.xml ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/pom.xml b/curator-x-discovery-server/pom.xml index 6b95f99..6a3b96b 100644 --- a/curator-x-discovery-server/pom.xml +++ b/curator-x-discovery-server/pom.xml @@ -27,7 +27,6 @@ <version>2.4.2-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery-server</artifactId> <version>2.4.2-SNAPSHOT</version> <packaging>bundle</packaging> @@ -37,7 +36,6 @@ <inceptionYear>2011</inceptionYear> <properties> - <jersey.version>1.11</jersey.version> <osgi.import.package> * </osgi.import.package> @@ -55,14 +53,6 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> - </dependency> - - <dependency> - <!-- only for TypeLiteral - in the future will be replaced by Guava 13 --> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>3.0</version> </dependency> <dependency> @@ -74,56 +64,43 @@ <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> - <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.22</version> <scope>test</scope> </dependency> <dependency> <groupId>net.sf.scannotation</groupId> <artifactId>scannotation</artifactId> - <version>1.0.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> - <version>2.3.0.GA</version> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.scannotation</groupId> - <artifactId>scannotation</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> @@ -132,7 +109,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.13</version> <configuration> <parallel>none</parallel> </configuration> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java index 57ff81a..4929ccc 100644 --- a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java +++ b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/GenericDiscoveryContext.java @@ -18,17 +18,15 @@ */ package org.apache.curator.x.discovery.server.contexts; -import javax.ws.rs.ext.ContextResolver; -import javax.ws.rs.ext.Provider; - -import com.google.inject.TypeLiteral; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.node.ObjectNode; - +import com.google.common.reflect.TypeToken; import org.apache.curator.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.server.rest.DiscoveryContext; +import org.codehaus.jackson.JsonNode; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.node.ObjectNode; +import javax.ws.rs.ext.ContextResolver; +import javax.ws.rs.ext.Provider; /** * For convenience, a version of {@link DiscoveryContext} that uses any generic type as the payload @@ -39,14 +37,14 @@ public class GenericDiscoveryContext<T> implements DiscoveryContext<T>, ContextR private final ServiceDiscovery<T> serviceDiscovery; private final ProviderStrategy<T> providerStrategy; private final int instanceRefreshMs; - private final TypeLiteral<T> payloadType; // in the future - replace TypeLiteral with corresponding api from Guava 13 + private final TypeToken<T> payloadType; public GenericDiscoveryContext(ServiceDiscovery<T> serviceDiscovery, ProviderStrategy<T> providerStrategy, int instanceRefreshMs, Class<T> payloadType) { - this(serviceDiscovery, providerStrategy, instanceRefreshMs, TypeLiteral.get(payloadType)); + this(serviceDiscovery, providerStrategy, instanceRefreshMs, TypeToken.of(payloadType)); } - public GenericDiscoveryContext(ServiceDiscovery<T> serviceDiscovery, ProviderStrategy<T> providerStrategy, int instanceRefreshMs, TypeLiteral<T> payloadType) + public GenericDiscoveryContext(ServiceDiscovery<T> serviceDiscovery, ProviderStrategy<T> providerStrategy, int instanceRefreshMs, TypeToken<T> payloadType) { this.serviceDiscovery = serviceDiscovery; this.providerStrategy = providerStrategy; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java index 3db03fa..864a874 100644 --- a/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java +++ b/curator-x-discovery-server/src/main/java/org/apache/curator/x/discovery/server/contexts/MapDiscoveryContext.java @@ -18,7 +18,7 @@ */ package org.apache.curator.x.discovery.server.contexts; -import com.google.inject.TypeLiteral; +import com.google.common.reflect.TypeToken; import org.apache.curator.x.discovery.ProviderStrategy; import org.apache.curator.x.discovery.ServiceDiscovery; import org.apache.curator.x.discovery.server.rest.DiscoveryContext; @@ -35,6 +35,6 @@ public class MapDiscoveryContext extends GenericDiscoveryContext<Map<String, Str { public MapDiscoveryContext(ServiceDiscovery<Map<String, String>> serviceDiscovery, ProviderStrategy<Map<String, String>> providerStrategy, int instanceRefreshMs) { - super(serviceDiscovery, providerStrategy, instanceRefreshMs, new TypeLiteral<Map<String, String>>(){}); + super(serviceDiscovery, providerStrategy, instanceRefreshMs, new TypeToken<Map<String, String>>(){}); } } http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java index 1693b86..5dc16c8 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestMapsWithJersey.java @@ -28,7 +28,6 @@ import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.api.core.DefaultResourceConfig; import com.sun.jersey.spi.container.servlet.ServletContainer; -import junit.framework.Assert; import org.apache.curator.test.InstanceSpec; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; @@ -43,6 +42,7 @@ import org.apache.curator.x.discovery.strategies.RandomStrategy; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java index f6dc27f..80f2e4a 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestObjectPayloadWithJersey.java @@ -18,20 +18,16 @@ */ package org.apache.curator.x.discovery.server.jetty_jersey; -import java.util.Set; - -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MediaType; - -import junit.framework.Assert; - -import org.apache.curator.test.InstanceSpec; -import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.Context; -import org.mortbay.jetty.servlet.ServletHolder; - import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.GenericType; +import com.sun.jersey.api.client.WebResource; +import com.sun.jersey.api.client.config.ClientConfig; +import com.sun.jersey.api.client.config.DefaultClientConfig; +import com.sun.jersey.api.core.DefaultResourceConfig; +import com.sun.jersey.spi.container.servlet.ServletContainer; +import org.apache.curator.test.InstanceSpec; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; import org.apache.curator.x.discovery.server.entity.JsonServiceInstanceMarshaller; @@ -41,16 +37,16 @@ import org.apache.curator.x.discovery.server.entity.ServiceInstances; import org.apache.curator.x.discovery.server.entity.ServiceNames; import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery; import org.apache.curator.x.discovery.strategies.RandomStrategy; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.GenericType; -import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.api.client.config.ClientConfig; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.api.core.DefaultResourceConfig; -import com.sun.jersey.spi.container.servlet.ServletContainer; +import org.mortbay.jetty.Server; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; +import java.util.Set; public class TestObjectPayloadWithJersey { http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java index 012ac19..8cf43cc 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_jersey/TestStringsWithJersey.java @@ -20,28 +20,28 @@ package org.apache.curator.x.discovery.server.jetty_jersey; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.sun.jersey.api.client.Client; +import com.sun.jersey.api.client.GenericType; +import com.sun.jersey.api.client.WebResource; +import com.sun.jersey.api.client.config.ClientConfig; +import com.sun.jersey.api.client.config.DefaultClientConfig; +import com.sun.jersey.api.core.DefaultResourceConfig; +import com.sun.jersey.spi.container.servlet.ServletContainer; import org.apache.curator.test.InstanceSpec; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; +import org.apache.curator.x.discovery.server.contexts.StringDiscoveryContext; import org.apache.curator.x.discovery.server.entity.JsonServiceInstanceMarshaller; import org.apache.curator.x.discovery.server.entity.JsonServiceInstancesMarshaller; import org.apache.curator.x.discovery.server.entity.JsonServiceNamesMarshaller; import org.apache.curator.x.discovery.server.entity.ServiceInstances; import org.apache.curator.x.discovery.server.entity.ServiceNames; import org.apache.curator.x.discovery.server.mocks.MockServiceDiscovery; -import org.apache.curator.x.discovery.server.contexts.StringDiscoveryContext; import org.apache.curator.x.discovery.strategies.RandomStrategy; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.GenericType; -import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.api.client.config.ClientConfig; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.api.core.DefaultResourceConfig; -import com.sun.jersey.spi.container.servlet.ServletContainer; -import junit.framework.Assert; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java index 4ab447f..cc9592c 100644 --- a/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java +++ b/curator-x-discovery-server/src/test/java/org/apache/curator/x/discovery/server/jetty_resteasy/TestStringsWithRestEasy.java @@ -26,13 +26,13 @@ import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceType; import org.apache.curator.x.discovery.server.entity.ServiceInstances; import org.apache.curator.x.discovery.server.entity.ServiceNames; -import junit.framework.Assert; import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher; import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.ServletHolder; +import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery/pom.xml ---------------------------------------------------------------------- diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml index 36eaf60..fc54b49 100644 --- a/curator-x-discovery/pom.xml +++ b/curator-x-discovery/pom.xml @@ -27,7 +27,6 @@ <version>2.4.2-SNAPSHOT</version> </parent> - <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> <version>2.4.2-SNAPSHOT</version> <packaging>bundle</packaging> @@ -54,7 +53,6 @@ <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.2</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java ---------------------------------------------------------------------- diff --git a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java index 52cbea8..974e81c 100644 --- a/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java +++ b/curator-x-discovery/src/test/java/org/apache/curator/x/discovery/TestUriSpec.java @@ -19,7 +19,7 @@ package org.apache.curator.x.discovery; import com.google.common.collect.Maps; -import junit.framework.Assert; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Iterator; import java.util.Map; http://git-wip-us.apache.org/repos/asf/curator/blob/426db3d3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 18e5907..0991e04 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,35 @@ <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <jdk-version>1.6</jdk-version> + + <!-- versions --> + <maven-project-info-reports-plugin-version>2.7</maven-project-info-reports-plugin-version> + <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> + <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version> + <maven-install-plugin-version>2.5.1</maven-install-plugin-version> + <maven-compiler-plugin-version>3.1</maven-compiler-plugin-version> + <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version> + <maven-surefire-plugin-version>2.17</maven-surefire-plugin-version> + <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> + <maven-site-plugin-version>3.3</maven-site-plugin-version> + <doxia-module-confluence-version>1.5</doxia-module-confluence-version> + <maven-scm-publish-plugin-version>1.0</maven-scm-publish-plugin-version> + <maven-license-plugin-version>1.9.0</maven-license-plugin-version> + <maven-release-plugin-version>2.5</maven-release-plugin-version> + <apache-rat-plugin-version>0.10</apache-rat-plugin-version> + <javassist-version>3.18.1-GA</javassist-version> + <commons-math-version>2.2</commons-math-version> + <jackson-mapper-asl-version>1.9.13</jackson-mapper-asl-version> + <jersey-version>1.18.1</jersey-version> + <jsr311-api-version>1.1.1</jsr311-api-version> + <jetty-version>6.1.26</jetty-version> + <scannotation-version>1.0.2</scannotation-version> + <resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version> + <zookeeper-version>3.4.6</zookeeper-version> + <guava-version>16.0.1</guava-version> + <testng-version>6.8.8</testng-version> + <!-- OSGi Properties --> <osgi.export.package /> <osgi.import.package /> @@ -231,49 +260,157 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> + <version>1.7.6</version> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.8.5</version> + <version>1.9.5</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-client</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-framework</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-recipes</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-x-discovery-server</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist-version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + <version>${commons-math-version}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + <version>${jackson-mapper-asl-version}</version> + </dependency> + + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + <version>${jersey-version}</version> + </dependency> + + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-servlet</artifactId> + <version>${jersey-version}</version> + </dependency> + + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey-version}</version> + </dependency> + + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + <version>${jersey-version}</version> + </dependency> + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>${jsr311-api-version}</version> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + <version>${jetty-version}</version> + </dependency> + + <dependency> + <groupId>net.sf.scannotation</groupId> + <artifactId>scannotation</artifactId> + <version>${scannotation-version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>${resteasy-jaxrs-version}</version> + <exclusions> + <exclusion> + <groupId>org.scannotation</groupId> + <artifactId>scannotation</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <version>${zookeeper-version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava-version}</version> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng-version}</version> </dependency> </dependencies> </dependencyManagement> @@ -282,44 +419,16 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.5</version> - <exclusions> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>14.0.1</version> </dependency> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.1.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> <scope>test</scope> </dependency> </dependencies> @@ -329,13 +438,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.7</version> + <version>${maven-project-info-reports-plugin-version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9.1</version> + <version>${maven-javadoc-plugin-version}</version> <configuration> <aggregate>true</aggregate> </configuration> @@ -344,6 +453,76 @@ </reporting> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven-dependency-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <version>${maven-install-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven-bundle-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven-surefire-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven-javadoc-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>${maven-site-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>${maven-scm-publish-plugin-version}</version> + </plugin> + + <plugin> + <groupId>com.mycila.maven-license-plugin</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>${maven-license-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${maven-release-plugin-version}</version> + </plugin> + + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>${apache-rat-plugin-version}</version> + </plugin> + </plugins> + </pluginManagement> + <resources> <resource> <directory>${basedir}</directory> @@ -360,13 +539,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.8</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> <configuration> <createChecksum>true</createChecksum> </configuration> @@ -375,16 +552,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.0</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>${jdk-version}</source> + <target>${jdk-version}</target> </configuration> </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> <extensions>true</extensions> <inherited>true</inherited> <configuration> @@ -420,7 +596,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> <configuration> <forkCount>1</forkCount> <reuseForks>false</reuseForks> @@ -431,7 +606,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> <configuration> <aggregate>true</aggregate> </configuration> @@ -440,7 +614,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.3</version> <configuration> <locales>en</locales> <skipDeploy>true</skipDeploy> @@ -449,7 +622,7 @@ <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-confluence</artifactId> - <version>1.3</version> + <version>${doxia-module-confluence-version}</version> </dependency> </dependencies> <executions> @@ -465,7 +638,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.0-beta-2</version> <inherited>false</inherited> <configuration> <checkinComment>Curator website deployment</checkinComment> @@ -486,7 +658,6 @@ <plugin> <groupId>com.mycila.maven-license-plugin</groupId> <artifactId>maven-license-plugin</artifactId> - <version>1.9.0</version> <configuration> <header>src/etc/header.txt</header> <excludes> @@ -518,7 +689,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.4.1</version> <configuration> <arguments>-Dmaven.test.skip=true</arguments> <mavenExecutorId>forked-path</mavenExecutorId> @@ -528,7 +698,6 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.8</version> <configuration> <numUnapprovedLicenses>0</numUnapprovedLicenses> <excludeSubProjects>false</excludeSubProjects>
