diff --git a/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonActorRefDeserializer.java b/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonActorRefDeserializer.java index 9d88d89d..99598955 100644 --- a/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonActorRefDeserializer.java +++ b/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonActorRefDeserializer.java @@ -44,6 +44,7 @@ public ActorRef deserialize(JsonParser jp, DeserializationContext ctxt) throws I if (curr == JsonToken.VALUE_STRING) { return actorRefFactory.create(jp.getText()); } - throw ctxt.mappingException(_valueClass, curr); + ctxt.handleUnexpectedToken(_valueClass, jp); + return null; // never gets here } } diff --git a/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonScheduledMessageRefDeserializer.java b/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonScheduledMessageRefDeserializer.java index 56124908..a7906d7f 100644 --- a/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonScheduledMessageRefDeserializer.java +++ b/main/base/src/main/java/org/elasticsoftware/elasticactors/base/serialization/JacksonScheduledMessageRefDeserializer.java @@ -44,6 +44,7 @@ public ScheduledMessageRef deserialize(JsonParser jp, DeserializationContext ctx if (curr == JsonToken.VALUE_STRING) { return scheduledMessageRefFactory.create(jp.getText()); } - throw ctxt.mappingException(_valueClass, curr); + ctxt.handleUnexpectedToken(_valueClass, jp); + return null; // never gets here } } diff --git a/main/pom.xml b/main/pom.xml index 890c6900..524e633d 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -33,49 +33,52 @@ 3.11.14 2.0-0 - 5.3.25 - 1.9.7 - 3.22.2 - 4.0.0 - 2.20.0 - 31.1-jre - 2.14.2 - 3.0.1 - 2.0.6 + 5.3.35 + + 1.9.20.1 + 3.25.3 + 4.0.2 + 2.23.1 + 33.2.0-jre + 2.17.1 + 3.1.0 + 2.0.13 0.10.2 - 3.29.2-GA + 3.30.2-GA 0.6.3 - 5.16.0 + 5.21.0 0.5.5 1.8.0 - 3.4.0 - 3.11.3 - 4.15.0 + 3.7.0 + 3.11.5 + 4.17.0 3.1.0 2.28.0 - 3.4.4 - 2.24ea45 - - 5.8.0 + 4.0.0 + 2.25ea60 + + 2.2.16 7.10.2 4.13.3 4.1.0 - 7.7.1 - 3.12.4 + 7.10.2 + 5.12.0 11 1.3.2 2.7.9 - 4.2.0 + 4.2.1 1.0.4 3.0.2 2.2 - 3.5.1 - 4.1.90.Final - 1.10.5 + 4.0.1 + 4.1.109.Final + 1.13.0 0.2.0 + + 2.2.1 @@ -148,16 +151,17 @@ import pom - + - net.java.dev.jna - jna - ${jna.version} + com.github.jnr + jnr-ffi + ${jnr.version} + - net.java.dev.jna - jna-platform - ${jna.version} + org.hdrhistogram + HdrHistogram + ${hdrhistogram.version} javax.inject diff --git a/pom.xml b/pom.xml index 055c893b..e8198fcc 100644 --- a/pom.xml +++ b/pom.xml @@ -83,40 +83,40 @@ maven-compiler-plugin - 3.8.1 + 3.13.0 maven-surefire-plugin - 3.0.0-M5 + 3.2.5 maven-jar-plugin - 3.2.0 + 3.4.1 maven-source-plugin - 3.2.1 + 3.3.1 maven-enforcer-plugin - 3.0.0-M3 + 3.4.1 maven-assembly-plugin - 3.2.0 + 3.7.1 maven-shade-plugin - 3.4.1 + 3.5.3 org.simplify4u.plugins sign-maven-plugin - 0.3.1 + 1.1.0 maven-javadoc-plugin - 3.5.0 + 3.6.3 8 org.elasticsoftware.elasticactors.serialization.protobuf:org.elasticsoftware.elasticactors.cluster.protobuf @@ -125,12 +125,12 @@ org.codehaus.mojo buildnumber-maven-plugin - 3.0.0 + 3.1.0 org.codehaus.mojo aspectj-maven-plugin - 1.14.0 + 1.15.0 org.xolstice.maven.plugins @@ -140,22 +140,22 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.6.0 org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.2 com.googlecode.maven-download-plugin download-maven-plugin - 1.5.0 + 1.9.0 org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.13