Skip to content

Commit

Permalink
update dependencies (#31)
Browse files Browse the repository at this point in the history 
* update dependencies

* fix loopback address

* spotless

* fix test
  • Loading branch information
@atoulme
atoulme committed Sep 29, 2023
1 parent cab2960 commit f9be606
Show file tree
Hide file tree
Showing 7 changed files with 77 additions and 58 deletions.
6 changes: 3 additions & 3 deletions crypto/src/main/java/org/apache/tuweni/crypto/sodium/Sodium.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public static void loadLibrary(Path path) {
.load(library.toString());
initializeLibrary(lib);

synchronized (LibSodium.class) {
synchronized (Sodium.class) {
Sodium.libSodium = lib;
}
}
Expand Down Expand Up @@ -158,14 +158,14 @@ public static void searchLibrary(String libraryName, Path... paths) {
LibSodium lib = loader.load(libraryName);
initializeLibrary(lib);

synchronized (LibSodium.class) {
synchronized (Sodium.class) {
Sodium.libSodium = lib;
}
}

private static LibSodium libSodium() {
if (libSodium == null) {
synchronized (LibSodium.class) {
synchronized (Sodium.class) {
if (libSodium == null) {
LibSodium lib =
LibraryLoader.create(LibSodium.class)
Expand Down
90 changes: 45 additions & 45 deletions dependency-versions.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,61 +12,61 @@
*/
dependencyManagement {
dependencies {
dependency('ch.qos.logback:logback-classic:1.4.7')
dependency('commons-codec:commons-codec:1.15')
dependency('ch.qos.logback:logback-classic:1.4.11')
dependency('commons-codec:commons-codec:1.16.0')
dependency('commons-net:commons-net:3.9.0')
dependency('com.fasterxml.jackson.core:jackson-databind:2.15.2')
dependency('com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2')
dependency('com.github.jnr:jnr-ffi:2.2.13')
dependency('com.github.jnr:jnr-ffi:2.2.14')
dependency('com.github.codemonstur:embedded-redis:1.0.0')
dependency('com.google.code.findbugs:jsr305:3.0.2')
dependency('com.google.errorprone:error_prone_annotations:2.19.1')
dependency('com.google.errorprone:error_prone_core:2.19.1')
dependency('com.google.guava:guava:32.0.0-jre')
dependency('com.h2database:h2:2.1.214')
dependency('com.google.errorprone:error_prone_annotations:2.21.1')
dependency('com.google.errorprone:error_prone_core:2.21.1')
dependency('com.google.guava:guava:32.1.2-jre')
dependency('com.h2database:h2:2.2.220')
dependency('com.jolbox:bonecp:0.8.0.RELEASE')
dependency('com.netflix.concurrency-limits:concurrency-limits-core:0.4.0')
dependency('com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0')
dependency('com.opentable.components:otj-pg-embedded:1.0.1')
dependency('com.squareup.okhttp3:okhttp:5.0.0-alpha.11')
dependency('com.winterbe:expekt:0.5.0')
dependency('com.zaxxer:HikariCP:5.0.1')
dependency('info.picocli:picocli:4.7.3')
dependency('io.grpc:grpc-netty-shaded:1.55.1')
dependency('info.picocli:picocli:4.7.4')
dependency('io.grpc:grpc-netty-shaded:1.57.2')
dependency('net.java.dev.jna:jna:5.13.0')
dependency('org.hyperledger.besu:bls12-381:0.7.1')
dependency('org.hyperledger.besu:altbn128:0.7.1')
dependency('org.hyperledger.besu:bls12-381:0.8.1')
dependency('org.hyperledger.besu:altbn128:0.8.1')
dependency('org.hyperledger.besu:secp256k1:0.4.3')
dependency('org.apache.httpcomponents.client5:httpclient5:5.2.1')
dependency('org.apache.httpcomponents.client5:httpclient5:5.3-alpha1')

dependency('org.springframework:spring-context:6.0.9')
dependency('org.springframework.boot:spring-boot:3.1.0')
dependency('org.springframework.boot:spring-boot-starter:3.1.0')
dependency('org.springframework.boot:spring-boot-starter-thymeleaf:3.1.0')
dependency('org.springframework.boot:spring-boot-starter-web:3.1.0')
dependency('org.springframework.boot:spring-boot-starter-webflux:3.1.0')
dependency('org.springframework.boot:spring-boot-starter-tomcat:3.1.0')
dependency('org.springframework:spring-context:6.0.11')
dependency('org.springframework.boot:spring-boot:3.1.2')
dependency('org.springframework.boot:spring-boot-starter:3.1.2')
dependency('org.springframework.boot:spring-boot-starter-thymeleaf:3.1.2')
dependency('org.springframework.boot:spring-boot-starter-web:3.1.2')
dependency('org.springframework.boot:spring-boot-starter-webflux:3.1.2')
dependency('org.springframework.boot:spring-boot-starter-tomcat:3.1.2')

dependency('io.opentelemetry:opentelemetry-api:1.26.0')
dependency('io.opentelemetry:opentelemetry-api:1.29.0')
dependency('io.opentelemetry:opentelemetry-api-metrics:1.10.0-alpha-rc.1')
dependency('io.opentelemetry:opentelemetry-exporter-otlp-metrics:1.14.0')
dependency('io.opentelemetry:opentelemetry-exporter-otlp:1.26.0')
dependency('io.opentelemetry:opentelemetry-exporter-prometheus:1.26.0-alpha')
dependency('io.opentelemetry:opentelemetry-exporter-otlp:1.29.0')
dependency('io.opentelemetry:opentelemetry-exporter-prometheus:1.29.0-alpha')
dependency('io.opentelemetry:opentelemetry-extension-trace-propagators:1.2.0')
dependency('io.opentelemetry:opentelemetry-proto:1.7.1-alpha')
dependency('io.opentelemetry:opentelemetry-sdk:1.26.0')
dependency('io.opentelemetry:opentelemetry-sdk-trace:1.26.0')
dependency('io.opentelemetry:opentelemetry-sdk-metrics:1.26.0')
dependency('io.opentelemetry:opentelemetry-sdk-testing:1.26.0')
dependency('io.opentelemetry:opentelemetry-sdk:1.29.0')
dependency('io.opentelemetry:opentelemetry-sdk-trace:1.29.0')
dependency('io.opentelemetry:opentelemetry-sdk-metrics:1.29.0')
dependency('io.opentelemetry:opentelemetry-sdk-testing:1.29.0')

dependency('io.opentelemetry:opentelemetry-semconv:1.26.0-alpha')
dependency('io.opentelemetry:opentelemetry-semconv:1.29.0-alpha')
dependency('io.prometheus:simpleclient:0.16.0')
dependency('io.prometheus:simpleclient_httpserver:0.16.0')
dependency('redis.clients:jedis:5.0.0-beta1')
dependency('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.10')
dependency('org.webjars:swagger-ui:4.18.2')
dependency('redis.clients:jedis:5.0.0-beta2')
dependency('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.15')
dependency('org.webjars:swagger-ui:5.4.2')

dependencySet(group: 'io.vertx', version: '4.4.2') {
dependencySet(group: 'io.vertx', version: '4.4.4') {
entry 'vertx-core'
entry 'vertx-lang-kotlin'
entry 'vertx-lang-kotlin-coroutines'
Expand All @@ -83,7 +83,7 @@ dependencyManagement {
entry 'antlr4-runtime'
}
dependency('javax.ws.rs:javax.ws.rs-api:2.1.1')
dependency('org.apache.lucene:lucene-core:9.6.0')
dependency('org.apache.lucene:lucene-core:9.7.0')
dependency('org.apache.openjpa:openjpa:3.2.2')
dependency('org.assertj:assertj-core:3.24.2')
dependencySet(group: 'org.bouncycastle', version: '1.70') {
Expand All @@ -96,25 +96,25 @@ dependencyManagement {
entry 'jetty-servlets'
entry 'jetty-util'
}
dependencySet(group: 'org.glassfish.jersey.core', version: '3.1.2') {
dependencySet(group: 'org.glassfish.jersey.core', version: '3.1.3') {
entry 'jersey-server'
entry 'jersey-client'
}
dependency('org.glassfish.jersey.containers:jersey-container-servlet:3.1.2')
dependency('org.glassfish.jersey.inject:jersey-hk2:3.1.2')
dependency('org.glassfish.jersey.containers:jersey-container-servlet:3.1.3')
dependency('org.glassfish.jersey.inject:jersey-hk2:3.1.3')
dependency('org.glassfish.jersey.media:jersey-media-json-jackson:3.0.5')
dependency('javax.xml.bind:jaxb-api:2.4.0-b180830.0359')
dependency('org.flywaydb:flyway-core:9.19.1')
dependency('org.flywaydb:flyway-core:9.21.1')

dependency('org.openlabtesting.leveldbjni:leveldbjni-all:1.8')
dependencySet(group: 'org.junit.jupiter', version: '5.10.0-M1') {
dependencySet(group: 'org.junit.jupiter', version: '5.10.0') {
entry 'junit-jupiter-api'
entry 'junit-jupiter-engine'
entry 'junit-jupiter-params'
entry 'junit-jupiter-migrationsupport'
}
dependency('org.infinispan:infinispan-core:15.0.0.Dev01')
dependency('org.infinispan:infinispan-cachestore-rocksdb:15.0.0.Dev01')
dependency('org.infinispan:infinispan-core:15.0.0.Dev02')
dependency('org.infinispan:infinispan-cachestore-rocksdb:15.0.0.Dev02')


dependency('org.jetbrains:annotations:23.1.0')
Expand All @@ -123,7 +123,7 @@ dependencyManagement {
entry 'kotlin-stdlib'
entry 'kotlin-stdlib-jdk8'
}
dependencySet(group: 'org.jetbrains.kotlinx', version: '1.7.1') {
dependencySet(group: 'org.jetbrains.kotlinx', version: '1.7.3') {
entry 'kotlinx-coroutines-core'
entry 'kotlinx-coroutines-jdk8'
}
Expand All @@ -133,17 +133,17 @@ dependencyManagement {
}
dependency('org.mapdb:mapdb:3.0.9')
dependency('org.miracl.milagro.amcl:milagro-crypto-java:0.4.0')
dependency('org.mockito:mockito-junit-jupiter:5.3.1')
dependency('org.mockito:mockito-junit-jupiter:5.4.0')
dependency('org.postgresql:postgresql:42.6.0')

dependency('org.rocksdb:rocksdbjni:8.1.1.1')
dependency('org.rocksdb:rocksdbjni:8.3.2')
dependency('org.slf4j:slf4j-api:2.0.7')
dependency('org.connid:framework:1.3.2')
dependency('org.connid:framework-internal:1.3.2')

dependency('org.webjars:bootstrap:5.2.3')
dependency('org.webjars:webjars-locator:0.46')
dependency('org.webjars:bootstrap:5.3.1')
dependency('org.webjars:webjars-locator:0.47')

dependency('org.xerial.snappy:snappy-java:1.1.10.0')
dependency('org.xerial.snappy:snappy-java:1.1.10.3')
}
}
2 changes: 1 addition & 1 deletion eth-crawler/src/main/kotlin/org/apache/tuweni/eth/crawler/CrawlerRESTService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class CrawlerRESTService(
val swagger = ServletHolder("swagger-ui", DefaultServlet::class.java)
swagger.setInitParameter(
"resourceBase",
CrawlerRESTService::class.java.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/4.18.2/")
CrawlerRESTService::class.java.getClassLoader().getResource("META-INF/resources/webjars/swagger-ui/5.4.2/")
.toString(),
)
swagger.setInitParameter("pathInfoOnly", "true")
Expand Down
2 changes: 1 addition & 1 deletion gossip/src/main/java/org/apache/tuweni/gossip/GossipCommandLineOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void validate() {
}
peers();
try {
InetAddress.getByName(networkInterface);
InetAddress.getAllByName(networkInterface);
} catch (UnknownHostException e) {
throw new IllegalArgumentException("Invalid network interface");
}
Expand Down
6 changes: 4 additions & 2 deletions rlpx/src/integrationTest/java/org/apache/tuweni/rlpx/vertx/VertxRLPxServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.tuweni.rlpx.wire.SubProtocolIdentifier;
import org.apache.tuweni.rlpx.wire.WireConnection;

import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -207,7 +208,8 @@ void connectToOtherPeerWithNoSubProtocols(@VertxInstance Vertx vertx) throws Exc
WireConnection conn =
service
.connectTo(
peerPair.publicKey(), new InetSocketAddress("127.0.0.1", peerService.actualPort()))
peerPair.publicKey(),
new InetSocketAddress(InetAddress.getLoopbackAddress(), peerService.actualPort()))
.get();
assertEquals(DisconnectReason.USELESS_PEER, conn.getDisconnectReason());
service.stop();
Expand All @@ -233,7 +235,7 @@ void disconnectAfterStop(@VertxInstance Vertx vertx) throws Exception {
service
.connectTo(
peerPair.publicKey(),
new InetSocketAddress("127.0.0.1", peerService.actualPort()))
new InetSocketAddress(InetAddress.getLoopbackAddress(), peerService.actualPort()))
.get();
} finally {
service.stop();
Expand Down
24 changes: 21 additions & 3 deletions rlpx/src/main/java/org/apache/tuweni/rlpx/vertx/VertxRLPxService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import org.apache.tuweni.rlpx.wire.SubProtocolIdentifier;
import org.apache.tuweni.rlpx.wire.WireConnection;

import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
Expand Down Expand Up @@ -164,8 +166,15 @@ public VertxRLPxService(
repository.addDisconnectionListener(
c -> {
if (keepAliveList.contains(c.peerPublicKey())) {

tryConnect(c.peerPublicKey(), new InetSocketAddress(c.peerHost(), c.peerPort()));
try {
InetAddress[] addresses = InetAddress.getAllByName(c.peerHost());
if (addresses.length == 0) {
throw new IllegalArgumentException("invalid host " + c.peerHost());
}
tryConnect(c.peerPublicKey(), new InetSocketAddress(addresses[0], c.peerPort()));
} catch (UnknownHostException e) {
throw new RuntimeException(e);
}
}
});
if (meter != null) {
Expand Down Expand Up @@ -366,7 +375,16 @@ public InetSocketAddress actualSocketAddress() {
if (!started.get()) {
throw new IllegalStateException("The RLPx service is not active");
}
return new InetSocketAddress(networkInterface, server.actualPort());
InetAddress[] addresses = new InetAddress[0];
try {
addresses = InetAddress.getAllByName(networkInterface);
} catch (UnknownHostException e) {
throw new RuntimeException(e);
}
if (addresses.length == 0) {
throw new RuntimeException("invalid host " + networkInterface);
}
return new InetSocketAddress(addresses[0], server.actualPort());
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions rlpx/src/main/java/org/apache/tuweni/rlpx/wire/DefaultWireConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand All @@ -36,7 +35,7 @@ public final class DefaultWireConnection implements WireConnection {
private final Consumer<RLPxMessage> writer;
private final Consumer<HelloMessage> afterHandshakeListener;
private final Runnable disconnectHandler;
private final LinkedHashMap<SubProtocolIdentifier, SubProtocolHandler> subprotocols;
private final Map<SubProtocolIdentifier, SubProtocolHandler> subprotocols;
private final int p2pVersion;
private final String clientId;
private final int advertisedPort;
Expand Down Expand Up @@ -76,7 +75,7 @@ public DefaultWireConnection(
Consumer<RLPxMessage> writer,
Consumer<HelloMessage> afterHandshakeListener,
Runnable disconnectHandler,
LinkedHashMap<SubProtocolIdentifier, SubProtocolHandler> subprotocols,
Map<SubProtocolIdentifier, SubProtocolHandler> subprotocols,
int p2pVersion,
String clientId,
int advertisedPort,
Expand Down

0 comments on commit f9be606

Please sign in to comment.