Skip to content
This repository has been archived by the owner on Jul 7, 2020. It is now read-only.

Increments the curator dependency version number. #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Increments the curator dependency version number. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4146e2
Increments the curator dependency version number.
Dec 9, 2014
13c9a73
Finish upgrading dependencies and organize them.
Dec 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 20 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<artifactId>jar-pom</artifactId>
<groupId>com.addthis.common.build.maven.pom</groupId>
<version>3.1.0</version>
<version>3.4.0</version>
</parent>

<groupId>com.addthis</groupId>
Expand All @@ -32,32 +32,17 @@
</licenses>

<properties>
<!-- enforcer plugin must be explicitly enabled with -Denforcer.skip=false -->
<enforcer.skip>true</enforcer.skip>
<bark.dep.basis.version>2.2.2</bark.dep.basis.version>
<bark.dep.curator.version>2.7.0</bark.dep.curator.version>
<bark.dep.netty3.version>3.9.3.Final</bark.dep.netty3.version>
<bark.dep.zookeeper.version>3.4.6</bark.dep.zookeeper.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<configuration>
<rules>
<DependencyConvergence />
</rules>
<fail>true</fail>
<skip>${enforcer.skip}</skip>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.addthis</groupId>
<artifactId>basis</artifactId>
<version>2.2.2</version>
<version>${bark.dep.basis.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -109,7 +94,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.5</version>
<version>${bark.dep.zookeeper.version}</version>
<exclusions>
<exclusion>
<!-- note the incorrect groupid in this version of ZooKeeper -->
Expand Down Expand Up @@ -139,12 +124,11 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.9.3.Final</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
<version>2.4.0</version>
<version>${bark.dep.curator.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -159,7 +143,7 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<version>2.4.0</version>
<version>${bark.dep.curator.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -195,6 +179,16 @@
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${bark.dep.netty3.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<reporting>
<plugins>
<plugin>
Expand All @@ -210,7 +204,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.10</version>
<version>0.11</version>
</plugin>
</plugins>
</reporting>
Expand Down
6 changes: 4 additions & 2 deletions src/test/java/com/addthis/bark/ZkGroupMembershipTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import com.google.common.collect.ImmutableSet;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.CyclicBarrier;
Expand Down Expand Up @@ -47,18 +46,21 @@ public class ZkGroupMembershipTest {

private CuratorFramework myZkClient;

private TestingServer myKeeper;

@Before
public void startKeepers() throws Exception {
InstanceSpec spec = new InstanceSpec(null, -1, -1, -1, true, -1, 2000, 10);
System.setProperty("zk.servers", "localhost:" + spec.getPort());
System.setProperty("zookeeper.serverCnxnFactory", "org.apache.zookeeper.server.NettyServerCnxnFactory");
TestingServer myKeeper = new TestingServer(spec);
myKeeper = new TestingServer(spec, true);
myZkClient = CuratorFrameworkFactory.newClient("localhost:" + spec.getPort(), new RetryOneTime(1000));
myZkClient.start();
}

@After
public void stopKeepers() throws IOException {
myKeeper.stop();
}


Expand Down
3 changes: 0 additions & 3 deletions ...in/java/com/addthis/bark/ZkStartUtil.java → ...st/java/com/addthis/bark/ZkStartUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.RetryOneTime;
import org.apache.curator.test.InstanceSpec;
import org.apache.curator.test.QuorumConfigBuilder;
import org.apache.curator.test.TestingServer;
import org.apache.curator.test.TestingZooKeeperServer;
import org.junit.After;
import org.junit.Before;

Expand Down