Browse Source

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 <eolivelli@apache.org>

Reviewers: phunt@apache.org

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
Enrico Olivelli 6 years ago
parent
commit
313ff9f7e4

+ 0 - 10
pom.xml

@@ -382,16 +382,6 @@
         <artifactId>netty</artifactId>
         <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>

+ 2 - 2
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>
 

+ 6 - 1
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>
+</project>