Micronaut upgrade (#3548)

* Micronaut upgrade * Excluding spotbugs and jsr305 annotations. Signed-off-by: Tomas Langer <tomas.langer@oracle.com>
helidon-io · Oct 14, 2021 · 1a6113e · 1a6113e
1 parent 40934aa
commit 1a6113e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -96,9 +96,9 @@
         <version.lib.mariadb-java-client>2.6.2</version.lib.mariadb-java-client>
         <version.lib.maven-wagon>2.10</version.lib.maven-wagon>
         <version.lib.micrometer>1.6.6</version.lib.micrometer>
-        <version.lib.micronaut>2.2.0</version.lib.micronaut>
-        <version.lib.micronaut.data>2.2.0</version.lib.micronaut.data>
-        <version.lib.micronaut.sql>3.3.1</version.lib.micronaut.sql>
+        <version.lib.micronaut>2.5.13</version.lib.micronaut>
+        <version.lib.micronaut.data>2.5.0</version.lib.micronaut.data>
+        <version.lib.micronaut.sql>3.4.0</version.lib.micronaut.sql>
         <version.lib.microprofile-config>1.4</version.lib.microprofile-config>
         <version.lib.microprofile-fault-tolerance-api>2.1.1</version.lib.microprofile-fault-tolerance-api>
         <version.lib.microprofile-graphql>1.1.0</version.lib.microprofile-graphql>
@@ -1095,6 +1095,14 @@
                         <groupId>javax.inject</groupId>
                         <artifactId>javax.inject</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs-annotations</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.code.findbugs</groupId>
+                        <artifactId>jsr305</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

diff --git a/...cronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/model/Pet.java b/...cronaut/data/src/main/java/io/helidon/examples/integrations/micronaut/data/model/Pet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.micronaut.core.annotation.Creator;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.annotation.AutoPopulated;
 
 /**

diff --git a/...icronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/CdiExecutableMethod.java b/...icronaut/cdi/src/main/java/io/helidon/integrations/micronaut/cdi/CdiExecutableMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,7 +154,10 @@ private static AnnotationMetadata annotationMetadata(Annotated annotated, Annota
         for (String miAnnotationName : miAnnotationNames) {
             try {
                 Annotation annotation = miAnnotated.synthesize((Class<? extends Annotation>) Class.forName(miAnnotationName));
-                annotations.put(annotation.annotationType(), annotation);
+                if (annotation != null) {
+                    // annotation is present
+                    annotations.put(annotation.annotationType(), annotation);
+                }
             } catch (Throwable ignored) {
                 // this annotation is not on the classpath, we can ignore it
             }

diff --git a/...ions/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/app/Pet.java b/...ions/micronaut/data/src/test/java/io/helidon/integrations/micronaut/cdi/data/app/Pet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
-import edu.umd.cs.findbugs.annotations.Nullable;
 import io.micronaut.core.annotation.Creator;
+import io.micronaut.core.annotation.Nullable;
 import io.micronaut.data.annotation.AutoPopulated;
 
 @Entity