Skip to content

Commit

Permalink
Update ZooKeeper to 3.6.1 (#581)
Browse files Browse the repository at this point in the history
  • Loading branch information
@eolivelli
eolivelli authored May 13, 2020
1 parent 2d50b5a commit 086f0f7
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 48 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
.idea
**/*.iml
*.iml
**/.DS_Store

# Release
pom.xml.tag
Expand Down
12 changes: 12 additions & 0 deletions herddb-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-jute</artifactId>
</dependency>
<dependency>
<!-- needed for ZK server -->
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- needed for ZK server -->
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
51 changes: 31 additions & 20 deletions herddb-jdbc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,32 +36,43 @@
<groupId>${project.groupId}</groupId>
<artifactId>herddb-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${libs.slf4j}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- needed for ZK server -->
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- needed for ZK server -->
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -78,19 +89,19 @@
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>uber</shadedClassifierName>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>uber</shadedClassifierName>
<artifactSet>
<excludes>
<exclude>jline:jline</exclude>
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</manifestEntries>
</transformer>
</transformers>
<filters>
Expand All @@ -111,19 +122,19 @@
<goals>
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>embedded</shadedClassifierName>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>embedded</shadedClassifierName>
<artifactSet>
<excludes>
<excludes>
<exclude>jline:jline</exclude>
</excludes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</manifestEntries>
</transformer>
</transformers>
<filters>
Expand Down
64 changes: 37 additions & 27 deletions herddb-services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<name>HerdDB Services</name>
<artifactId>herddb-services</artifactId>
<artifactId>herddb-services</artifactId>
<packaging>jar</packaging>
<properties>
<buildTimestamp>${maven.build.timestamp}</buildTimestamp>
<jetty.version>9.4.18.v20190429</jetty.version>
<libs.jaxws.jaxb-api>2.3.0</libs.jaxws.jaxb-api>
<libs.jaxws.jaxb-impl>2.3.0</libs.jaxws.jaxb-impl>
<libs.javaxactivation.api>1.2.0</libs.javaxactivation.api>
</properties>
</properties>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand All @@ -45,7 +45,7 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${libs.jaxws.jaxb-impl}</version>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>herddb-core</artifactId>
Expand All @@ -62,14 +62,24 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>herddb-jdbc</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<classifier>uber</classifier>
</dependency>
<dependency>
<!-- needed for ZK server -->
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
</dependency>
<dependency>
<!-- needed for ZK server -->
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
Expand All @@ -84,23 +94,23 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId>
<artifactId>bookkeeper-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.bookkeeper.stats</groupId>
Expand All @@ -109,37 +119,37 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
</dependency>


<!-- web ui -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>herddb-ui</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
<type>war</type>
<classifier>war-no-libs</classifier>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>herddb-jdbc</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>herddb-ui</artifactId>
<version>${project.version}</version>
<version>${project.version}</version>
<scope>runtime</scope>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
Expand All @@ -155,9 +165,9 @@
<artifactId>jersey-media-json-jackson</artifactId>
<version>${libs.jersey}</version>
</dependency>

</dependencies>
<build>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
Expand All @@ -166,7 +176,7 @@
</resources>
<plugins>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
Expand All @@ -184,30 +194,30 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assemble/zip-assembly.xml</descriptor>
</descriptors>
<descriptor>src/main/assemble/zip-assembly.xml</descriptor>
</descriptors>
<attach>true</attach>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
12 changes: 11 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<libs.calcite>1.22.0</libs.calcite>
<libs.commonslang>2.6</libs.commonslang>
<libs.jackson.mapper>2.10.3</libs.jackson.mapper>
<libs.zookeeper>3.5.7</libs.zookeeper>
<libs.zookeeper>3.6.1</libs.zookeeper>
<libs.jsqlparser>3.1</libs.jsqlparser>
<libs.curator>2.12.0</libs.curator>
<libs.guava>21.0</libs.guava>
Expand Down Expand Up @@ -213,6 +213,16 @@
<artifactId>jsqlparser</artifactId>
<version>${libs.jsqlparser}</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>3.2.5</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>1.1.7</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
Expand Down

0 comments on commit 086f0f7

Please sign in to comment.