mirror of
https://github.com/jlengrand/helidon.git
synced 2026-03-10 08:21:17 +00:00
Upgrade config libraries (#1159)
* Removed com.google.protobuf:protobuf-java dependency; it becomes 4th party as it is used by io.grpc:grpc-protobuf. * Updated com.typesafe:config version from 1.3.3 to 1.4.0. * Removed unnecessary junit dependency. * Updated jgit from 4.9.0.201710071750-r to 5.5.1.201910021850-r. * Updated etcd4j from 2.16.0 to 2.17.0. * Change jgit version to v4.11.9.201909030838-r. * Change jgit version to 4.11.9.201909030838-r. * Change jgit version to 4.9.9.201903122025-r. * Add com:jcraft.jsch:0.1.55 dependency to update version used by jgit. * Update automatic module "protobuf.java" name to "com.google.protobuf".
This commit is contained in:
@@ -69,10 +69,6 @@
|
||||
<groupId>io.grpc</groupId>
|
||||
<artifactId>grpc-stub</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.typesafe</groupId>
|
||||
<artifactId>config</artifactId>
|
||||
|
||||
@@ -25,7 +25,7 @@ module io.helidon.config.etcd {
|
||||
requires io.grpc;
|
||||
requires grpc.protobuf;
|
||||
requires grpc.stub;
|
||||
requires protobuf.java;
|
||||
requires com.google.protobuf;
|
||||
requires com.google.common;
|
||||
requires io.helidon.common;
|
||||
|
||||
|
||||
@@ -70,12 +70,6 @@
|
||||
<artifactId>org.eclipse.jgit.junit</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<!-- needed for jgit junit dependency -->
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
|
||||
10
dependencies/pom.xml
vendored
10
dependencies/pom.xml
vendored
@@ -44,7 +44,7 @@
|
||||
<version.lib.eclipselink>2.7.4</version.lib.eclipselink>
|
||||
<version.lib.el-api>3.0.0</version.lib.el-api>
|
||||
<version.lib.el-impl>3.0.0</version.lib.el-impl>
|
||||
<version.lib.etcd4j>2.16.0</version.lib.etcd4j>
|
||||
<version.lib.etcd4j>2.17.0</version.lib.etcd4j>
|
||||
<version.lib.google-api-client>1.30.5</version.lib.google-api-client>
|
||||
<version.lib.graalvm>19.2.0</version.lib.graalvm>
|
||||
<version.lib.grpc>1.25.0</version.lib.grpc>
|
||||
@@ -88,14 +88,13 @@
|
||||
<version.lib.opentracing.grpc>0.2.1</version.lib.opentracing.grpc>
|
||||
<version.lib.persistence-api>2.2</version.lib.persistence-api>
|
||||
<version.lib.prometheus>0.6.0</version.lib.prometheus>
|
||||
<version.lib.protobuf.java>3.5.1</version.lib.protobuf.java>
|
||||
<version.lib.reactivestreams>1.0.2</version.lib.reactivestreams>
|
||||
<version.lib.reactor>3.1.5.RELEASE</version.lib.reactor>
|
||||
<version.lib.slf4j>1.7.26</version.lib.slf4j>
|
||||
<version.lib.smallrye-openapi>1.1.1</version.lib.smallrye-openapi>
|
||||
<version.lib.snakeyaml>1.24</version.lib.snakeyaml>
|
||||
<version.lib.transaction-api>1.2</version.lib.transaction-api>
|
||||
<version.lib.typesafe-config>1.3.3</version.lib.typesafe-config>
|
||||
<version.lib.typesafe-config>1.4.0</version.lib.typesafe-config>
|
||||
<version.lib.ucp>19.3.0.0</version.lib.ucp>
|
||||
<version.lib.validation-api>2.0.1.Final</version.lib.validation-api>
|
||||
<version.lib.weld>3.1.1.Final</version.lib.weld>
|
||||
@@ -314,11 +313,6 @@
|
||||
<artifactId>opentracing-grpc</artifactId>
|
||||
<version>${version.lib.opentracing.grpc}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>${version.lib.protobuf.java}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Webserver related -->
|
||||
<dependency>
|
||||
|
||||
@@ -34,7 +34,7 @@ module io.helidon.grpc.core {
|
||||
requires transitive io.grpc;
|
||||
requires io.netty.handler;
|
||||
requires io.netty.transport;
|
||||
requires transitive protobuf.java;
|
||||
requires transitive com.google.protobuf;
|
||||
|
||||
requires java.annotation;
|
||||
requires java.logging;
|
||||
|
||||
@@ -27,7 +27,7 @@ module io.helidon.microprofile.grpc.server {
|
||||
|
||||
requires transitive io.grpc;
|
||||
requires grpc.protobuf.lite;
|
||||
requires protobuf.java;
|
||||
requires com.google.protobuf;
|
||||
|
||||
requires java.logging;
|
||||
|
||||
@@ -36,4 +36,4 @@ module io.helidon.microprofile.grpc.server {
|
||||
|
||||
provides javax.enterprise.inject.spi.Extension
|
||||
with io.helidon.microprofile.grpc.server.GrpcServerCdiExtension;
|
||||
}
|
||||
}
|
||||
|
||||
9
pom.xml
9
pom.xml
@@ -56,7 +56,8 @@
|
||||
<version.lib.asm>6.0</version.lib.asm>
|
||||
<version.lib.checkstyle>8.18</version.lib.checkstyle>
|
||||
<version.lib.groovy-all>2.4.14</version.lib.groovy-all>
|
||||
<version.lib.jgit>4.9.0.201710071750-r</version.lib.jgit>
|
||||
<version.lib.jgit>4.9.9.201903122025-r</version.lib.jgit>
|
||||
<version.lib.jsch>0.1.55</version.lib.jsch>
|
||||
<version.lib.netty.tcnative>2.0.26.Final</version.lib.netty.tcnative>
|
||||
<version.lib.restito>0.9.1</version.lib.restito>
|
||||
<version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
|
||||
@@ -694,6 +695,12 @@
|
||||
<artifactId>org.eclipse.jgit</artifactId>
|
||||
<version>${version.lib.jgit}</version>
|
||||
</dependency>
|
||||
<!-- Used to update version used by jgit -->
|
||||
<dependency>
|
||||
<groupId>com.jcraft</groupId>
|
||||
<artifactId>jsch</artifactId>
|
||||
<version>${version.lib.jsch}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jgit</groupId>
|
||||
<artifactId>org.eclipse.jgit.junit</artifactId>
|
||||
|
||||
Reference in New Issue
Block a user