#706 调整zookeeper版本为3.4.14

vipshop · Jul 28, 2020 · 8444944 · 8444944
1 parent 77ad5eb
commit 8444944
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ dist: trusty
 
 jdk:
   - oraclejdk8
+  - openjdk7
 
 branches:
   only:

diff --git a/pom.xml b/pom.xml
@@ -33,14 +33,14 @@
 
 	<properties>
 		<argLine>-Dfile.encoding=UTF-8</argLine>
-		<java.version>1.8</java.version>
+		<java.version>1.7</java.version>
 		<maven.version.range>[3.0.4,)</maven.version.range>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.locale>zh_CN</project.build.locale>
 
 		<quartz.version>2.2.1</quartz.version>
 		<curator.version>2.10.0</curator.version>
-        <zookeeper.version>3.5.8</zookeeper.version>
+        <zookeeper.version>3.4.14</zookeeper.version>
         <springframework.version>4.3.2.RELEASE</springframework.version>
 		<spring-boot-test.version>1.5.3.RELEASE</spring-boot-test.version>
 
@@ -222,6 +222,20 @@
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
                 <version>${zookeeper.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>jline</groupId>
+                        <artifactId>jline</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-log4j12</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 			<!-- ZK Client end -->
 			<!-- Spring begin -->