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 c9a6050 ZOOKEEPER-3122: fix some maven release related issues
c9a6050 is described below
commit c9a60500fea39faeca84f90a3fb22c6664adbe12
Author: Norbert Kalmar <[email protected]>
AuthorDate: Tue Apr 2 15:08:21 2019 +0200
ZOOKEEPER-3122: fix some maven release related issues
While testing the maven release procedure, I found some problems (missing
license file, unused dependencies)
Author: Norbert Kalmar <[email protected]>
Reviewers: [email protected]
Closes #885 from nkalmar/branch-3.5 and squashes the following commits:
014d9666b [Norbert Kalmar] ZOOKEEPER-3122 - fix typo in license
152cbb5c7 [Norbert Kalmar] ZOOKEEPER-3122 - fix some maven release related
issues
---
pom.xml | 6 ------
zookeeper-assembly/pom.xml | 2 +-
zookeeper-assembly/src/main/assembly/bin-package.xml | 12 ------------
zookeeper-server/pom.xml | 6 ++----
zookeeper-server/src/main/resources/LICENSE.txt | 4 ++++
.../json-simple-1.1.1.LICENSE.txt} | 20 +-------------------
6 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 455ecd0..997b628 100755
--- a/pom.xml
+++ b/pom.xml
@@ -285,7 +285,6 @@
<kerby.version>1.1.0</kerby.version>
<bouncycastle.version>1.60</bouncycastle.version>
<commons-collections.version>3.2.2</commons-collections.version>
- <commons-lang.version>2.6</commons-lang.version>
<spotbugsannotations.version>3.1.9</spotbugsannotations.version>
</properties>
@@ -302,11 +301,6 @@
<version>${commons-collections.version}</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons-lang.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.yetus</groupId>
<artifactId>audience-annotations</artifactId>
<version>${audience-annotations.version}</version>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index ed0dca3..81cf419 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.5.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/zookeeper-assembly/src/main/assembly/bin-package.xml
b/zookeeper-assembly/src/main/assembly/bin-package.xml
index 5083ed6..3653575 100644
--- a/zookeeper-assembly/src/main/assembly/bin-package.xml
+++ b/zookeeper-assembly/src/main/assembly/bin-package.xml
@@ -83,13 +83,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../zookeeper-jute/target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>zookeeper-*-sources.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../zookeeper-recipes/zookeeper-recipes-election/target</directory>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -118,11 +111,6 @@
<outputDirectory>lib/cobertura</outputDirectory>
<fileMode>${rw.file.permission}</fileMode>
</file>
- <file>
-
<source>${project.basedir}/../zookeeper-server/src/main/resources/lib/jdiff/zookeeper_3.1.1.xml</source>
- <outputDirectory>lib/jdiff</outputDirectory>
- <fileMode>${rw.file.permission}</fileMode>
- </file>
</files>
</assembly>
\ No newline at end of file
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index b3c1414..575aa5a 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -51,10 +51,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
<version>3.5.5-SNAPSHOT</version>
@@ -98,10 +94,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>jline</groupId>
diff --git a/zookeeper-server/src/main/resources/LICENSE.txt
b/zookeeper-server/src/main/resources/LICENSE.txt
index efa786f..b1264c0 100644
--- a/zookeeper-server/src/main/resources/LICENSE.txt
+++ b/zookeeper-server/src/main/resources/LICENSE.txt
@@ -214,6 +214,10 @@ This distribution bundles SLF4J 1.7.5, which is available
under the MIT
License. For details, see a copy of the license in
lib/slf4j-1.7.5.LICENSE.txt
+This distribution bundles json-simple v1.1.1, which is available under the
+Apache Software License, Version 2.0. For details, see a copy of the license in
+lib/json-simple-1.1.1.LICENSE.txt
+
This distribution bundles a modified version of 'JZLib' as part of
Netty-3.7.0, which is available under the 3-clause BSD licence. For
details, see a copy of the licence in META-INF/license/LICENSE-jzlib.txt
diff --git a/zookeeper-server/src/main/resources/LICENSE.txt
b/zookeeper-server/src/main/resources/lib/json-simple-1.1.1.LICENSE.txt
similarity index 93%
copy from zookeeper-server/src/main/resources/LICENSE.txt
copy to zookeeper-server/src/main/resources/lib/json-simple-1.1.1.LICENSE.txt
index efa786f..6279e52 100644
--- a/zookeeper-server/src/main/resources/LICENSE.txt
+++ b/zookeeper-server/src/main/resources/lib/json-simple-1.1.1.LICENSE.txt
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright [yyyy] [name of copyright owner]
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -200,21 +200,3 @@
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.
-
-
-This distribution bundles javacc, which is available under the
-3-clause BSD License. For details, see a copy of the license in
-lib/javacc.LICENSE.txt
-
-This distribution bundles jline 2.11, which is available under the
-2-clause BSD License. For details, see a copy of the license in
-lib/jline-2.11.LICENSE.txt
-
-This distribution bundles SLF4J 1.7.5, which is available under the MIT
-License. For details, see a copy of the license in
-lib/slf4j-1.7.5.LICENSE.txt
-
-This distribution bundles a modified version of 'JZLib' as part of
-Netty-3.7.0, which is available under the 3-clause BSD licence. For
-details, see a copy of the licence in META-INF/license/LICENSE-jzlib.txt
-as part of the Netty jar in lib/netty-3.7.0.Final.jar.
