[#3547] Migrate to Quarkus 3.2.6.Final

eclipse-hono · Oct 1, 2023 · 5e0681e · 5e0681e
1 parent 00a508e
commit 5e0681e
Show file tree

Hide file tree

Showing 84 changed files with 263 additions and 276 deletions.
diff --git a/adapter-base/src/main/java/org/eclipse/hono/adapter/AbstractProtocolAdapterApplication.java b/adapter-base/src/main/java/org/eclipse/hono/adapter/AbstractProtocolAdapterApplication.java
@@ -19,8 +19,6 @@
 import java.util.Optional;
 import java.util.concurrent.Executors;
 
-import javax.inject.Inject;
-
 import org.eclipse.hono.adapter.monitoring.ConnectionEventProducer;
 import org.eclipse.hono.adapter.monitoring.ConnectionEventProducerConfig;
 import org.eclipse.hono.adapter.monitoring.ConnectionEventProducerOptions;
@@ -104,6 +102,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
+import jakarta.inject.Inject;
 
 /**
  * A Quarkus main application base class for Hono protocol adapters.

diff --git a/adapters/amqp/pom.xml b/adapters/amqp/pom.xml
@@ -31,6 +31,10 @@
       <groupId>org.eclipse.hono</groupId>
       <artifactId>hono-client-notification</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    </dependency>
 
     <!-- testing -->
     <dependency>

diff --git a/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/Application.java
@@ -12,14 +12,14 @@
  */
 package org.eclipse.hono.adapter.amqp.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
 import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication;
 import org.eclipse.hono.adapter.amqp.AmqpAdapterMetrics;
 import org.eclipse.hono.adapter.amqp.AmqpAdapterProperties;
 import org.eclipse.hono.adapter.amqp.VertxBasedAmqpProtocolAdapter;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 /**
  * The Hono AMQP adapter main application class.
  */

diff --git a/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java b/adapters/amqp/src/main/java/org/eclipse/hono/adapter/amqp/app/MetricsFactory.java
@@ -12,10 +12,6 @@
  */
 package org.eclipse.hono.adapter.amqp.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-
 import org.eclipse.hono.adapter.amqp.AmqpAdapterOptions;
 import org.eclipse.hono.adapter.amqp.AmqpAdapterProperties;
 import org.eclipse.hono.adapter.amqp.MicrometerBasedAmqpAdapterMetrics;
@@ -25,6 +21,9 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.vertx.core.Vertx;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 
 /**
  * A factory class that creates protocol adapter specific metrics.

diff --git a/adapters/coap/pom.xml b/adapters/coap/pom.xml
@@ -43,6 +43,10 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    </dependency>
 
   </dependencies>
 

diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/Application.java
@@ -14,9 +14,6 @@
 
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
 import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication;
 import org.eclipse.hono.adapter.coap.CoapAdapterMetrics;
 import org.eclipse.hono.adapter.coap.CoapAdapterProperties;
@@ -31,6 +28,9 @@
 import org.eclipse.hono.util.EventConstants;
 import org.eclipse.hono.util.TelemetryConstants;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 /**
  * The Hono CoAP adapter main application class.
  */

diff --git a/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java b/adapters/coap/src/main/java/org/eclipse/hono/adapter/coap/app/MetricsFactory.java
@@ -12,10 +12,6 @@
  */
 package org.eclipse.hono.adapter.coap.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-
 import org.eclipse.hono.adapter.coap.CoapAdapterOptions;
 import org.eclipse.hono.adapter.coap.CoapAdapterProperties;
 import org.eclipse.hono.adapter.coap.MicrometerBasedCoapAdapterMetrics;
@@ -25,6 +21,9 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.vertx.core.Vertx;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 
 /**
  * A factory class that creates protocol adapter specific metrics.

diff --git a/adapters/http/pom.xml b/adapters/http/pom.xml
@@ -33,6 +33,10 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/Application.java
@@ -12,14 +12,14 @@
  */
 package org.eclipse.hono.adapter.http.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
 import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication;
 import org.eclipse.hono.adapter.http.HttpAdapterMetrics;
 import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties;
 import org.eclipse.hono.adapter.http.impl.VertxBasedHttpProtocolAdapter;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+
 /**
  * The Hono HTTP adapter main application class.
  */

diff --git a/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java b/adapters/http/src/main/java/org/eclipse/hono/adapter/http/app/MetricsFactory.java
@@ -12,10 +12,6 @@
  */
 package org.eclipse.hono.adapter.http.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-
 import org.eclipse.hono.adapter.http.HttpProtocolAdapterOptions;
 import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties;
 import org.eclipse.hono.adapter.http.MicrometerBasedHttpAdapterMetrics;
@@ -25,6 +21,9 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.vertx.core.Vertx;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 
 /**
  * A factory class that creates protocol adapter specific metrics.

diff --git a/adapters/lora/pom.xml b/adapters/lora/pom.xml
@@ -52,6 +52,10 @@
        <groupId>jakarta.enterprise</groupId>
        <artifactId>jakarta.enterprise.cdi-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.inject</groupId>
+      <artifactId>jakarta.inject-api</artifactId>
+    </dependency>
 
     <!-- testing -->
     <dependency>

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/Application.java
@@ -15,10 +15,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
-
 import org.eclipse.hono.adapter.AbstractProtocolAdapterApplication;
 import org.eclipse.hono.adapter.http.HttpAdapterMetrics;
 import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties;
@@ -27,6 +23,9 @@
 import org.eclipse.hono.adapter.lora.providers.LoraProvider;
 
 import io.vertx.ext.web.client.WebClient;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 /**
  * The Hono Lora adapter main application class.

diff --git a/...lora/src/main/java/org/eclipse/hono/adapter/lora/app/LoraCommandSubscriptionsFactory.java b/...lora/src/main/java/org/eclipse/hono/adapter/lora/app/LoraCommandSubscriptionsFactory.java
@@ -13,14 +13,13 @@
 
 package org.eclipse.hono.adapter.lora.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-
 import org.eclipse.hono.adapter.lora.LoraCommandSubscriptions;
 
 import io.opentracing.Tracer;
 import io.vertx.core.Vertx;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 
 /**
  * A factory class that creates Lora adapter command subscriptions class. It'll always be a {@link Singleton}.

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/app/MetricsFactory.java
@@ -12,10 +12,6 @@
  */
 package org.eclipse.hono.adapter.lora.app;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
-
 import org.eclipse.hono.adapter.http.HttpProtocolAdapterOptions;
 import org.eclipse.hono.adapter.http.HttpProtocolAdapterProperties;
 import org.eclipse.hono.adapter.http.MicrometerBasedHttpAdapterMetrics;
@@ -26,6 +22,9 @@
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.smallrye.config.ConfigMapping;
 import io.vertx.core.Vertx;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
 
 /**
  * A factory class that creates protocol adapter specific metrics.

diff --git a/...ora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java b/...ora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityEnterpriseProvider.java
@@ -16,13 +16,12 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for Actility Enterprise.

diff --git a/.../lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java b/.../lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ActilityWirelessProvider.java
@@ -16,13 +16,12 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
 
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for Actility Wireless.

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackProvider.java
@@ -18,8 +18,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
@@ -29,6 +27,7 @@
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for ChirpStack.

diff --git a/...ters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackV4Provider.java b/...ters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/ChirpStackV4Provider.java
@@ -20,8 +20,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
@@ -31,6 +29,7 @@
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for ChirpStack v4.

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/EverynetProvider.java
@@ -18,8 +18,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
@@ -28,6 +26,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for Everynet.

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/FireflyProvider.java
@@ -16,8 +16,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
@@ -27,6 +25,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for Firefly.

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProvider.java
@@ -18,8 +18,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.GatewayInfo;
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
@@ -29,6 +27,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for Kerlink.

diff --git a/...c/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java b/...c/main/java/org/eclipse/hono/adapter/lora/providers/KerlinkProviderCustomContentType.java
@@ -17,12 +17,11 @@
 import java.util.Objects;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for Kerlink.

diff --git a/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java b/adapters/lora/src/main/java/org/eclipse/hono/adapter/lora/providers/LiveObjectsProvider.java
@@ -18,8 +18,6 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
-
 import org.eclipse.hono.adapter.lora.LoraMessageType;
 import org.eclipse.hono.adapter.lora.LoraMetaData;
 import org.eclipse.hono.util.MessageHelper;
@@ -29,6 +27,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.json.JsonObject;
+import jakarta.enterprise.context.ApplicationScoped;
 
 /**
  * A LoRaWAN provider with API for LiveObjectsProvider.