Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fixed transitive dependency issue

Rich Turner0e6bad07985a
diff --git a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java
index 185aa3815..a1783c7dd 100644
--- a/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java
+++ b/agent/src/main/java/org/openremote/agent/protocol/websocket/WebsocketClient.java
@@ -31,7 +31,6 @@ import io.netty.handler.ssl.SslContext;
import io.netty.handler.ssl.SslContextBuilder;
import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import io.netty.util.CharsetUtil;
-import org.apache.http.client.utils.URIBuilder;
import org.jboss.resteasy.client.jaxrs.ResteasyClient;
import org.openremote.agent.protocol.ProtocolExecutorService;
import org.openremote.agent.protocol.http.OAuthFilter;
diff --git a/gradle.properties b/gradle.properties
index b5b6ba06b..655ee364d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -28,7 +28,8 @@ hibernateValidatorVersion = 5.3.6.Final
postgresJdbcVersion = 42.1.4
hikaricpVersion = 2.7.2
junitVersion = 4.12
-spockVersion = 1.1-groovy-2.4
+spockVersion = 1.3-groovy-2.5
+byteBuddyVersion = 1.9.3
objenesisVersion = 2.2
camelVersion = 2.19.0
tyrusVersion = 1.10
diff --git a/model/build.gradle b/model/build.gradle
index 6c2cdfce3..8869a573f 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -22,6 +22,10 @@ dependencies {
compile "org.keycloak:keycloak-core:$keycloakVersion:sources"
compile "org.jeasy:easy-rules-core:$easyRulesVersion"
+
+ compile("com.google.inject:guice:4.2.2") {
+ force = true
+ }
}
jar {
diff --git a/test/build.gradle b/test/build.gradle
index 5ca27e399..c4341aa2e 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -14,6 +14,7 @@ dependencies {
compile "org.glassfish.tyrus:tyrus-client:$tyrusVersion"
compile "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"
compile "org.objenesis:objenesis:$objenesisVersion"
+ testRuntime "net.bytebuddy:byte-buddy:$byteBuddyVersion"
// We must have this on the regular classpath because we do weird
// things with GWT in tests, but without the transitive runtime