This is an automated email from the ASF dual-hosted git repository.
phunt pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new 313ff9f ZOOKEEPER-3304: Maven build of "loggraph" is broken on
branch-3.4
313ff9f is described below
commit 313ff9f7e4c14e40e92222db3a232fd647ba9cfe
Author: Enrico Olivelli <[email protected]>
AuthorDate: Thu Mar 14 08:55:20 2019 -0700
ZOOKEEPER-3304: Maven build of "loggraph" is broken on branch-3.4
Fix Jetty dependency.
Move it only to loggraph package.
It won't be subject to global dependecyManagement because it is not used by
core zookeeper-server module
Author: Enrico Olivelli <[email protected]>
Reviewers: [email protected]
Closes #847 from eolivelli/fix/netty-dep-34 and squashes the following
commits:
11ccc2ad4 [Enrico Olivelli] add ant files
c0311ff05 [Enrico Olivelli] Use latest Jetty 9.4.15.v20190215
1a7316417 [Enrico Olivelli] ZOOKEEPER-3304 Maven build of "loggraph" is
broken on branch-3.4
Change-Id: I5e3765e2ace3b6ee3561719f428fdd289efb7a8b
---
pom.xml | 10 ----------
zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml | 4 ++--
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 7 ++++++-
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6c47144..b6b3a95 100755
--- a/pom.xml
+++ b/pom.xml
@@ -383,16 +383,6 @@
<version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.version}</version>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml
b/zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml
index d6fa9d6..b116551 100644
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/ivy.xml
@@ -36,8 +36,8 @@
<!-- transitive false turns off dependency checking, log4j deps seem
borked -->
<dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-server"
rev="7.0.1.v20091125" />
- <dependency org="org.eclipse.jetty" name="jetty-servlet"
rev="7.0.1.v20091125" />
+ <dependency org="org.eclipse.jetty" name="jetty-server"
rev="9.4.15.v20190215" />
+ <dependency org="org.eclipse.jetty" name="jetty-servlet"
rev="9.4.15.v20190215" />
<dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1"
/>
</dependencies>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 45d9a0e..a2e9036 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -33,6 +33,9 @@
<description>
LogGraph is an application for viewing and filtering zookeeper logs. It
can handle transaction logs and message logs.
</description>
+ <properties>
+ <jetty.version>9.4.15.v20190215</jetty.version>
+ </properties>
<dependencies>
<dependency>
@@ -72,10 +75,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -91,4 +96,4 @@
</resources>
</build>
-</project>
\ No newline at end of file
+</project>
