From a909bffde7976f9e329c46db39ad787a310c2c56 Mon Sep 17 00:00:00 2001
From: Julien Giovaresco <dev@giovaresco.fr>
Date: Mon, 17 Jul 2023 10:54:13 +0200
Subject: [PATCH] feat(node-notifier): supports both javax and jakarta Inject
 annotation

Upgrading gravitee-plugin to 2.0.0 brings an updated gravitee-node-api
which does not declare javax.inject dependencies anynore. This prevented
the compilation of the gravitee-node-notifier module.

This commit adds the javax.inject dependency to fix the compilation. It
also supports the new annotation comming from Jakarta.
---
 gravitee-node-notifier/pom.xml                    | 15 +++++++++++++++
 .../plugin/impl/NotifierPluginFactoryImpl.java    |  2 +-
 pom.xml                                           |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/gravitee-node-notifier/pom.xml b/gravitee-node-notifier/pom.xml
index e85b71143..35a5322bd 100644
--- a/gravitee-node-notifier/pom.xml
+++ b/gravitee-node-notifier/pom.xml
@@ -29,12 +29,27 @@
     <artifactId>gravitee-node-notifier</artifactId>
     <name>Gravitee.io - Node - Notifier</name>
 
+    <properties>
+        <javax-inject.version>1</javax-inject.version>
+        <jakarta-inject.version>2.0.1</jakarta-inject.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.gravitee.node</groupId>
             <artifactId>gravitee-node-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${javax-inject.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${jakarta-inject.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>io.gravitee.plugin</groupId>
diff --git a/gravitee-node-notifier/src/main/java/io/gravitee/node/notifier/plugin/impl/NotifierPluginFactoryImpl.java b/gravitee-node-notifier/src/main/java/io/gravitee/node/notifier/plugin/impl/NotifierPluginFactoryImpl.java
index ad7ad4e35..1d71bef36 100644
--- a/gravitee-node-notifier/src/main/java/io/gravitee/node/notifier/plugin/impl/NotifierPluginFactoryImpl.java
+++ b/gravitee-node-notifier/src/main/java/io/gravitee/node/notifier/plugin/impl/NotifierPluginFactoryImpl.java
@@ -168,7 +168,7 @@ private Constructor<? extends Notifier> lookingForConstructor(Class<? extends No
     }
 
     private Set<Field> lookingForInjectableFields(Class<?> resourceClass) {
-        return ReflectionUtils.getAllFields(resourceClass, withAnnotation(Inject.class));
+        return ReflectionUtils.getAllFields(resourceClass, withAnnotations(Inject.class, jakarta.inject.Inject.class));
     }
 
     public static Predicate<Member> withParametersAssignableFrom(final Class... types) {
diff --git a/pom.xml b/pom.xml
index 58d533c7b..61e23ef34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,7 +265,7 @@
     <properties>
         <gravitee-bom.version>6.0.1</gravitee-bom.version>
         <gravitee-common.version>2.1.1</gravitee-common.version>
-        <gravitee-plugin.version>2.0.0-alpha.3</gravitee-plugin.version>
+        <gravitee-plugin.version>2.0.0</gravitee-plugin.version>
         <gravitee-reporter-api.version>1.25.0</gravitee-reporter-api.version>
         <gravitee-tracing-api.version>1.0.0</gravitee-tracing-api.version>
         <gravitee-kubernetes.version>2.0.3</gravitee-kubernetes.version>