You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2017/01/16 18:24:19 UTC
[1/5] curator git commit: Shaded Guava into Curator Client (and
Curator Test) so that it's no longer an issue for users. This should have
been done a long time ago. Unfortunately, com.google.common.base.Function,
com.google.common.base.Predicate and com.
Repository: curator
Updated Branches:
refs/heads/master 272444352 -> a47ab1e1d
Shaded Guava into Curator Client (and Curator Test) so that it's no longer an issue for users. This should have been done a long time ago. Unfortunately, com.google.common.base.Function, com.google.common.base.Predicate and com.google.common.reflect.TypeToken are in Curator's public API so those 3 classes are NOT shaded. However, this won't be a problem because there's no reason to think that Guava will change or remove these basic interfaces
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/fb277f96
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/fb277f96
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/fb277f96
Branch: refs/heads/master
Commit: fb277f9601411427dee7d26dd2be76941d38c0c3
Parents: 125dc96
Author: randgalt <ra...@apache.org>
Authored: Sat Jan 7 19:59:07 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sat Jan 7 19:59:07 2017 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++--
curator-test/pom.xml | 38 +++++++++++++++++++++++++++++++++++++-
pom.xml | 35 ++++++++++++++++++++++++++++++++++-
3 files changed, 109 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/fb277f96/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index 11e4a77..784989c 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?><!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -84,4 +83,41 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>apache-curator-guava-shader</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:guava</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>com.google.guava:guava</artifact>
+ <excludes>
+ <exclude>com/google/common/base/Function.class</exclude>
+ <exclude>com/google/common/base/Predicate.class</exclude>
+ <exclude>com/google/common/reflect/TypeToken.class</exclude>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
+
http://git-wip-us.apache.org/repos/asf/curator/blob/fb277f96/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 2e2c14c..0664b20 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -61,10 +61,46 @@
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>apache-curator-guava-shader</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:guava</include>
+ </includes>
+ </artifactSet>
+ <filters>
+ <filter>
+ <artifact>com.google.guava:guava</artifact>
+ <excludes>
+ <exclude>com/google/common/base/Function.class</exclude>
+ <exclude>com/google/common/base/Predicate.class</exclude>
+ <exclude>com/google/common/reflect/TypeToken.class</exclude>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/fb277f96/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb992f0..634659b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<testng-version>6.8.8</testng-version>
<swift-version>0.12.0</swift-version>
<dropwizard-version>0.7.0</dropwizard-version>
- <maven-shade-plugin-version>2.3</maven-shade-plugin-version>
+ <maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
<slf4j-version>1.7.6</slf4j-version>
<clirr-maven-plugin-version>2.6.1</clirr-maven-plugin-version>
@@ -783,6 +783,39 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>apache-curator-guava-shader</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <relocations>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>org.apache.curator.shaded.com.google</shadedPattern>
+ <excludes>
+ <exclude>com.google.common.base.Function</exclude>
+ <exclude>com.google.common.base.Predicate</exclude>
+ <exclude>com.google.common.reflect.TypeToken</exclude>
+ </excludes>
+ </relocation>
+ </relocations>
+ <artifactSet>
+ <includes>
+ <include>${project.groupId}:${project.artifactId}</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
[4/5] curator git commit: 1. Removed apache commons math dep from
curator-test 2. curator-test should have its own Guava shading as it doesn't
have a dependency on curator-client
Posted by ra...@apache.org.
1. Removed apache commons math dep from curator-test
2. curator-test should have its own Guava shading as it doesn't have a dependency on curator-client
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/53b931af
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/53b931af
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/53b931af
Branch: refs/heads/master
Commit: 53b931afea58759577bbf5da30dd89c48182b76b
Parents: 9f9a043
Author: randgalt <ra...@apache.org>
Authored: Mon Jan 9 13:13:36 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jan 9 13:13:36 2017 -0500
----------------------------------------------------------------------
curator-recipes/pom.xml | 6 ++++++
curator-test/pom.xml | 45 +++++++++++++++++++++++++++++++++++-----
curator-x-discovery/pom.xml | 6 ++++++
pom.xml | 8 +++++++
4 files changed, 60 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/53b931af/curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/curator-recipes/pom.xml b/curator-recipes/pom.xml
index 8a53cc2..c3e095e 100644
--- a/curator-recipes/pom.xml
+++ b/curator-recipes/pom.xml
@@ -73,5 +73,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/53b931af/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 3feb7ae..4cac12b 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -46,11 +46,6 @@
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math</artifactId>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -67,4 +62,44 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>apache-curator-guava-shader</id>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>com.google.guava:guava</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>org.apache.curator-test.shaded.com.google</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.google</pattern>
+ <shadedPattern>org.apache.curator-test.shaded.com.google</shadedPattern>
+ <includes>
+ <include>com.google.common.base.Function</include>
+ <include>com.google.common.base.Predicate</include>
+ <include>com.google.common.reflect.TypeToken</include>
+ </includes>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/53b931af/curator-x-discovery/pom.xml
----------------------------------------------------------------------
diff --git a/curator-x-discovery/pom.xml b/curator-x-discovery/pom.xml
index a7a7a21..8024351 100644
--- a/curator-x-discovery/pom.xml
+++ b/curator-x-discovery/pom.xml
@@ -72,5 +72,11 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/curator/blob/53b931af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 634659b..c37595e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -812,6 +812,14 @@
<include>${project.groupId}:${project.artifactId}</include>
</includes>
</artifactSet>
+ <filters>
+ <filter>
+ <artifact>com.google.guava:guava</artifact>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
[2/5] curator git commit: closes #188 - Let's close this in favor of
https://issues.apache.org/jira/browse/CURATOR-200
Posted by ra...@apache.org.
closes #188 - Let's close this in favor of https://issues.apache.org/jira/browse/CURATOR-200
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/b0b167ca
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/b0b167ca
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/b0b167ca
Branch: refs/heads/master
Commit: b0b167ca08bfd82ba520860ec1e4b5e1b02d8aee
Parents: fb277f9
Author: randgalt <ra...@apache.org>
Authored: Sun Jan 8 00:18:25 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Sun Jan 8 00:18:25 2017 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/5] curator git commit: Merge branch 'CURATOR-200'
Posted by ra...@apache.org.
Merge branch 'CURATOR-200'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/a47ab1e1
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/a47ab1e1
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/a47ab1e1
Branch: refs/heads/master
Commit: a47ab1e1d685fd1792ffd8d4e01412c91bb3dbe2
Parents: 2724443 53b931a
Author: randgalt <ra...@apache.org>
Authored: Mon Jan 16 13:24:02 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jan 16 13:24:02 2017 -0500
----------------------------------------------------------------------
curator-client/pom.xml | 40 ++++++++++++++++++++++++++++++++--
curator-recipes/pom.xml | 6 +++++
curator-test/pom.xml | 47 +++++++++++++++++++++++++++++++++++-----
curator-x-discovery/pom.xml | 6 +++++
pom.xml | 43 +++++++++++++++++++++++++++++++++++-
5 files changed, 133 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/a47ab1e1/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9814b25,c37595e..35a58bf
--- a/pom.xml
+++ b/pom.xml
@@@ -76,10 -76,10 +76,10 @@@
<scannotation-version>1.0.2</scannotation-version>
<resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version>
<guava-version>16.0.1</guava-version>
- <testng-version>6.8.8</testng-version>
+ <testng-version>6.10</testng-version>
<swift-version>0.12.0</swift-version>
<dropwizard-version>0.7.0</dropwizard-version>
- <maven-shade-plugin-version>2.3</maven-shade-plugin-version>
+ <maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
<slf4j-version>1.7.6</slf4j-version>
<clirr-maven-plugin-version>2.6.1</clirr-maven-plugin-version>
[3/5] curator git commit: Don't know what I was thinking. The
relocated classes should not be in testing
Posted by ra...@apache.org.
Don't know what I was thinking. The relocated classes should not be in testing
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/9f9a0430
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/9f9a0430
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/9f9a0430
Branch: refs/heads/master
Commit: 9f9a0430e6dd90209a1039e1dd10092af60a8f71
Parents: b0b167c
Author: randgalt <ra...@apache.org>
Authored: Mon Jan 9 12:05:32 2017 -0500
Committer: randgalt <ra...@apache.org>
Committed: Mon Jan 9 12:05:32 2017 -0500
----------------------------------------------------------------------
curator-test/pom.xml | 36 ------------------------------------
1 file changed, 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/9f9a0430/curator-test/pom.xml
----------------------------------------------------------------------
diff --git a/curator-test/pom.xml b/curator-test/pom.xml
index 0664b20..3feb7ae 100644
--- a/curator-test/pom.xml
+++ b/curator-test/pom.xml
@@ -67,40 +67,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>apache-curator-guava-shader</id>
- <goals>
- <goal>shade</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <artifactSet>
- <includes>
- <include>com.google.guava:guava</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>com.google.guava:guava</artifact>
- <excludes>
- <exclude>com/google/common/base/Function.class</exclude>
- <exclude>com/google/common/base/Predicate.class</exclude>
- <exclude>com/google/common/reflect/TypeToken.class</exclude>
- <exclude>META-INF/**</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>