This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new 09aa3c5 ZOOKEEPER-3372: Cleanup pom.xml in order to let Maven clients
import as few dependencies as possible
09aa3c5 is described below
commit 09aa3c5a21d327810eb969161c4d0b782f8210a5
Author: Enrico Olivelli <[email protected]>
AuthorDate: Mon Apr 29 13:49:28 2019 +0200
ZOOKEEPER-3372: Cleanup pom.xml in order to let Maven clients import as few
dependencies as possible
- mark as 'provided' all of the dependencies not needed by java clients
- rework assembly project in order to build correctly the 'lib' directory
- update jetty to latest version
- use project.version in order to refer to the current version
- fix references to junit in recipes and in contrib
Author: Enrico Olivelli <[email protected]>
Reviewers: [email protected]
Closes #926 from eolivelli/fix/ZOOKEEPER-3372-fix-dep-35
---
.travis.yml | 2 +-
pom.xml | 26 +++++++++++----
zookeeper-assembly/pom.xml | 28 +++++++++++++++-
.../src/main/assembly/bin-package.xml | 37 ++++++++++------------
.../zookeeper-contrib-loggraph/pom.xml | 6 ++--
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 6 ++--
.../zookeeper-contrib-zooinspector/pom.xml | 4 +--
zookeeper-docs/pom.xml | 1 -
zookeeper-recipes/pom.xml | 28 +++++++++++++++-
.../zookeeper-recipes-election/pom.xml | 17 +---------
zookeeper-recipes/zookeeper-recipes-lock/pom.xml | 22 -------------
zookeeper-recipes/zookeeper-recipes-queue/pom.xml | 17 +---------
zookeeper-server/pom.xml | 8 ++++-
13 files changed, 107 insertions(+), 95 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index d50004a..28f8d5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: java
sudo: false
jdk:
- openjdk8
- - openjdk11
+ - oraclejdk11
cache:
directories:
diff --git a/pom.xml b/pom.xml
index 34e5312..b617ecd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -277,11 +277,12 @@
<mockito.version>1.8.5</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
- <jetty.version>9.4.15.v20190215</jetty.version>
+ <jetty.version>9.4.17.v20190418</jetty.version>
<jackson.version>2.9.8</jackson.version>
<netty.version>4.1.29.Final</netty.version>
<json.version>1.1.1</json.version>
<jline.version>2.11</jline.version>
+ <snappy.version>1.1.7</snappy.version>
<kerby.version>1.1.0</kerby.version>
<bouncycastle.version>1.60</bouncycastle.version>
<commons-collections.version>3.2.2</commons-collections.version>
@@ -412,6 +413,12 @@
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jline</groupId>
@@ -419,12 +426,17 @@
<version>${jline.version}</version>
</dependency>
<dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <version>${spotbugsannotations.version}</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <version>${spotbugsannotations.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index 92919cb..ceacf8e 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -66,6 +66,32 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
+ <!-- list here all the jars we want to put in "lib"
+ and are in scope 'provided' -->
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -125,4 +151,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-assembly/src/main/assembly/bin-package.xml
b/zookeeper-assembly/src/main/assembly/bin-package.xml
index 529b483..1fa81d0 100644
--- a/zookeeper-assembly/src/main/assembly/bin-package.xml
+++ b/zookeeper-assembly/src/main/assembly/bin-package.xml
@@ -29,29 +29,24 @@
<componentDescriptor>src/main/assembly/components.xml</componentDescriptor>
</componentDescriptors>
- <moduleSets>
- <!-- ZooKeeper jars (excluding pom projects) including 3rd party
dependencies -->
- <moduleSet>
- <useAllReactorProjects>true</useAllReactorProjects>
+ <dependencySets>
+ <dependencySet>
<includes>
- <include>org.apache.zookeeper:zookeeper</include>
+ <include>*:*</include>
</includes>
-
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <excludes>
- <exclude>org.apache.zookeeper:zookeeper-recipes</exclude>
- <exclude>org.apache.zookeeper:zookeeper-client</exclude>
- <exclude>org.apache.zookeeper:zookeeper-docs</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
+ <excludes>
+ <exclude>org.apache.zookeeper:zookeeper-recipes</exclude>
+ <exclude>org.apache.zookeeper:zookeeper-client</exclude>
+ <exclude>org.apache.zookeeper:zookeeper-docs</exclude>
+ </excludes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>lib</outputDirectory>
+ <fileMode>${rw.file.permission}</fileMode>
+ <directoryMode>${rwx.file.permission}</directoryMode>
+ <useStrictFiltering>true</useStrictFiltering>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<fileSet>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 8e1a33d..eb45902 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
- <version>3.5.6-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -91,4 +91,4 @@
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index 1bd69de..4a49c98 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -135,4 +135,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 5b56a15..d6813a2 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -96,4 +96,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-docs/pom.xml b/zookeeper-docs/pom.xml
index c07f636..65fc885 100644
--- a/zookeeper-docs/pom.xml
+++ b/zookeeper-docs/pom.xml
@@ -29,7 +29,6 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-docs</artifactId>
- <version>3.5.6-SNAPSHOT</version>
<name>Apache ZooKeeper - Documentation</name>
<description>Documentation</description>
diff --git a/zookeeper-recipes/pom.xml b/zookeeper-recipes/pom.xml
index 95d4ac2..1d15018 100755
--- a/zookeeper-recipes/pom.xml
+++ b/zookeeper-recipes/pom.xml
@@ -62,6 +62,32 @@
<module>zookeeper-recipes-queue</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.github.spotbugs</groupId>
+ <artifactId>spotbugs-annotations</artifactId>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -74,4 +100,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
index bd01c9d..a4976f7 100755
--- a/zookeeper-recipes/zookeeper-recipes-election/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-election/pom.xml
@@ -34,21 +34,6 @@
This election interface recipe implements the leader election recipe
</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -71,4 +56,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
index 43c8190..e9a6079 100755
--- a/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-lock/pom.xml
@@ -34,28 +34,6 @@
This lock interface recipe implements the lock recipe
</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-annotations</artifactId>
- <version>3.1.9</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
index 9086194..e8df715 100755
--- a/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
+++ b/zookeeper-recipes/zookeeper-recipes-queue/pom.xml
@@ -39,21 +39,6 @@
It will only work correctly once ZOOKEEPER-22
https://issues.apache.org/jira/browse/ZOOKEEPER-22 is resolved.
</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.5.6-SNAPSHOT</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -76,4 +61,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 1b3a938..192c39b 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -53,11 +53,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
- <version>3.5.6-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.yetus</groupId>
@@ -78,18 +79,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -104,6 +109,7 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
