ACS-7029 ACS-7025 Bump Zookeeper to 3.4.14 (#1996)

This commit is contained in:
Domenico Sibilio
2024-04-03 12:16:52 +02:00
committed by GitHub
parent db788acf95
commit 9850e70552
3 changed files with 15 additions and 1 deletions

12
pom.xml
View File

@@ -90,6 +90,7 @@
<dependency.commons-io.version>2.15.1</dependency.commons-io.version>
<dependency.commons-codec.version>1.16.1</dependency.commons-codec.version>
<dependency.spring.version>5.3.33</dependency.spring.version>
<dependency.zookeeper.version>3.4.14</dependency.zookeeper.version>
<dependency.mime4j.version>0.8.11</dependency.mime4j.version>
</properties>
<dependencyManagement>
@@ -101,6 +102,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${dependency.zookeeper.version}</version>
<exclusions>
<exclusion>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>

View File

@@ -187,6 +187,7 @@
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/guava-31.1-jre.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/protobuf-java-3.6.1.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/commons-fileupload-1.3.3.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/WEB-INF/lib/zookeeper-3.4.10.jar" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/libs/jquery-2.1.3.min.js" />
<delete file="${project.build.directory}/solr-${solr.version}/server/solr-webapp/webapp/js/lib/jquery-1.7.2.min.js" />
</target>

View File

@@ -27,6 +27,7 @@ xpp3-1.1.4c.jar http://www.extreme.indiana.edu/dist/java-repository/xpp3/license
json-20231013.jar https://github.com/stleary/JSON-java
=== Apache 2.0 ===
audience-annotations-0.5.0.jar https://github.com/apache/yetus
error_prone_annotations-2.26.1.jar https://github.com/google/error-prone
jsr305-3.0.2.jar https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305/1.3.9
proj4j-1.1.5.jar https://github.com/locationtech/proj4j
@@ -230,4 +231,4 @@ t-digest-3.1.jar
vorbis-java-core-0.8.jar
vorbis-java-tika-0.8.jar
xz-1.6.jar
zookeeper-3.4.10.jar
zookeeper-3.4.14.jar