Upgrade build and update dependencies (#152)

* Upgrade to Micronaut 2.5.3 * Upgrade to Groovy 3.0.8 * Upgrade to Spock 2.0-M5-groovy-3.0 * Upgrade to micronaut-test 2.3.2 * Upgrade to Gradle 7.0 * Target Micronaut core 3.0.x * Upgrade NATS to 2.11.1 * Use Micronaut nullability annotations * Upgrade GraalVM to 21.1.0 * Upgrade to Gradle 7.0.2 * Upgrade internal build plugins to 4.0.0
micronaut-projects · May 17, 2021 · 99c1316 · 99c1316
1 parent d8c0413
commit 99c1316
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 39 deletions.
diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        graalvm: ['21.0.0.2.java8', '21.0.0.2.java11']
+        graalvm: ['21.1.0.java8', '21.1.0.java11']
     steps:
        # https://github.com/actions/virtual-environments/issues/709
       - name: Free disk space

diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     repositories {
-        maven { url "https://repo.grails.org/grails/core" }
+        gradlePluginPortal()
+        mavenCentral()
     }
     dependencies {
-        classpath "io.micronaut.build.internal:micronaut-gradle-plugins:3.0.3"
+        classpath 'io.micronaut.build.internal:micronaut-gradle-plugins:4.0.0'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,20 @@
 projectVersion=2.2.2-SNAPSHOT
-micronautDocsVersion=1.0.25
-micronautVersion=2.1.4
-micronautTestVersion=2.3.2
+micronautDocsVersion=2.0.0.RC1
+micronautVersion=2.5.3
+micronautTestVersion=2.3.3
 
-groovyVersion=3.0.5
-spockVersion=2.0-M3-groovy-3.0
+groovyVersion=3.0.8
+spockVersion=2.0-M5-groovy-3.0
 
-natsVersion=2.8.0
+natsVersion=2.11.1
 
 title=Micronaut Nats
 projectDesc=Integration between Micronaut and nats.io
 projectUrl=http://micronaut.io
 githubSlug=micronaut-projects/micronaut-nats
 developers=Joachim Grimm
 
-githubBranch=master
-githubCoreBranch=2.2.x
+githubCoreBranch=3.0.x
 bomProperty=micronautNatsIoVersion
 
 apimicronaut=https://docs.micronaut.io/latest/api/io/micronaut/

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/nats/src/main/java/io/micronaut/nats/connect/NatsConnectionFactoryConfig.java b/nats/src/main/java/io/micronaut/nats/connect/NatsConnectionFactoryConfig.java
@@ -28,12 +28,12 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 import javax.validation.constraints.NotNull;
 
 import io.micronaut.context.annotation.Parameter;
+import io.micronaut.core.annotation.Nullable;
 import io.nats.client.Nats;
 import io.nats.client.Options;
 

diff --git a/nats/src/main/java/io/micronaut/nats/exception/NatsListenerException.java b/nats/src/main/java/io/micronaut/nats/exception/NatsListenerException.java
@@ -17,8 +17,7 @@
 
 import java.util.Optional;
 
-import javax.annotation.Nullable;
-
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.messaging.exceptions.MessageListenerException;
 import io.nats.client.Message;
 

diff --git a/nats/src/main/java/io/micronaut/nats/reactive/PublishState.java b/nats/src/main/java/io/micronaut/nats/reactive/PublishState.java
@@ -15,7 +15,8 @@
  */
 package io.micronaut.nats.reactive;
 
-import javax.annotation.Nullable;
+import io.micronaut.core.annotation.Nullable;
+
 import javax.annotation.concurrent.Immutable;
 
 /**

diff --git a/nats/src/main/java/io/micronaut/nats/serdes/JavaLangNatsMessageSerDes.java b/nats/src/main/java/io/micronaut/nats/serdes/JavaLangNatsMessageSerDes.java
@@ -22,10 +22,10 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import javax.inject.Singleton;
 
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.serialize.exceptions.SerializationException;
 import io.micronaut.core.type.Argument;
 import io.nats.client.Message;
@@ -104,79 +104,79 @@ protected NatsMessageSerDes findSerDes(Argument<?> type) {
     /**
      * @return The serDes that handles {@link String}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<String> getStringSerDes() {
         return new StringSerDes();
     }
 
     /**
      * @return The serDes that handles {@link Short}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<Short> getShortSerDes() {
         return new ShortSerDes();
     }
 
     /**
      * @return The serDes that handles {@link Integer}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<Integer> getIntegerSerDes() {
         return new IntegerSerDes();
     }
 
     /**
      * @return The serDes that handles {@link Long}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<Long> getLongSerDes() {
         return new LongSerDes();
     }
 
     /**
      * @return The serDes that handles {@link Float}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<Float> getFloatSerDes() {
         return new FloatSerDes();
     }
 
     /**
      * @return The serDes that handles {@link Double}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<Double> getDoubleSerDes() {
         return new DoubleSerDes();
     }
 
     /**
      * @return The serDes that handles byte[]
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<byte[]> getByteArraySerDes() {
         return new ByteArraySerDes();
     }
 
     /**
      * @return The serDes that handles {@link ByteBuffer}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<ByteBuffer> getByteBufferSerDes() {
         return new ByteBufferSerDes();
     }
 
     /**
      * @return The serDes that handles {@link UUID}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<UUID> getUUIDSerDes() {
         return new UUIDSerDes();
     }
 
     /**
      * @return The serDes that handles {@link UUID}
      */
-    @Nonnull
+    @NonNull
     protected NatsMessageSerDes<Boolean> getBooleanSerDes() {
         return new BooleanSerDes();
     }

diff --git a/nats/src/main/java/io/micronaut/nats/serdes/JsonNatsMessageSerDes.java b/nats/src/main/java/io/micronaut/nats/serdes/JsonNatsMessageSerDes.java
@@ -20,13 +20,13 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
 import javax.inject.Singleton;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.reflect.ClassUtils;
 import io.micronaut.core.serialize.exceptions.SerializationException;
 import io.micronaut.core.type.Argument;

diff --git a/nats/src/main/java/io/micronaut/nats/serdes/NatsMessageSerDes.java b/nats/src/main/java/io/micronaut/nats/serdes/NatsMessageSerDes.java
@@ -15,8 +15,7 @@
  */
 package io.micronaut.nats.serdes;
 
-import javax.annotation.Nullable;
-
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.core.order.Ordered;
 import io.micronaut.core.type.Argument;
 import io.nats.client.Message;

diff --git a/nats/src/test/groovy/io/micronaut/nats/annotation/BindingSpec.groovy b/nats/src/test/groovy/io/micronaut/nats/annotation/BindingSpec.groovy
@@ -18,11 +18,10 @@ package io.micronaut.nats.annotation
 
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Requires
+import io.micronaut.core.annotation.Nullable
 import io.micronaut.nats.AbstractNatsTest
 import spock.util.concurrent.PollingConditions
 
-import javax.annotation.Nullable
-
 class BindingSpec extends AbstractNatsTest {
 
     void "test simple producing and consuming with a boolean"() {

diff --git a/nats/src/test/groovy/io/micronaut/nats/annotation/QueueSpec.groovy b/nats/src/test/groovy/io/micronaut/nats/annotation/QueueSpec.groovy
@@ -18,11 +18,10 @@ package io.micronaut.nats.annotation
 
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Requires
+import io.micronaut.core.annotation.Nullable
 import io.micronaut.nats.AbstractNatsTest
 import spock.util.concurrent.PollingConditions
 
-import javax.annotation.Nullable
-
 class QueueSpec extends AbstractNatsTest {
 
     void "test queue support"() {

diff --git a/nats/src/test/groovy/io/micronaut/nats/annotation/SimpleBindingSpec.groovy b/nats/src/test/groovy/io/micronaut/nats/annotation/SimpleBindingSpec.groovy
@@ -18,11 +18,10 @@ package io.micronaut.nats.annotation
 
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Requires
+import io.micronaut.core.annotation.Nullable
 import io.micronaut.nats.AbstractNatsTest
 import spock.util.concurrent.PollingConditions
 
-import javax.annotation.Nullable
-
 class SimpleBindingSpec extends AbstractNatsTest {
 
     void "test simple producing and consuming with a boolean"() {

diff --git a/nats/src/test/groovy/io/micronaut/nats/rpc/Consumer.groovy b/nats/src/test/groovy/io/micronaut/nats/rpc/Consumer.groovy
@@ -16,11 +16,10 @@
 package io.micronaut.nats.rpc
 
 import io.micronaut.context.annotation.Requires
+import io.micronaut.core.annotation.Nullable
 import io.micronaut.nats.annotation.NatsListener
 import io.micronaut.nats.annotation.Subject
 
-import javax.annotation.Nullable
-
 /**
  *
  * @author jgrimm