Quarkus version upgrade to 3.8.6 (#77)

* Quarkus version upgrade to 3.8.6 * solace messaging client upgrade * Changed maven compiler release version to java 17 * revert solace messaging client to 1.4.0 * testing solace java client upgrade to 1.6.0 * revert solace java client to 1.4.0 * added netty resolver and upgraded solace java version to 1.7.0 * reordered imports * revert solace java api version to 1.4.0 and discard netty fix * Code formatting * Remove Java 11 from build workflow * Documentation Update
SolaceLabs · Oct 29, 2024 · 6012094 · 6012094
1 parent 36d3d33
commit 6012094
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        java: [11, 17, 21]
+        java: [17, 21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Prepare git

diff --git a/.quarkus/cli/plugins/quarkus-cli-catalog.json b/.quarkus/cli/plugins/quarkus-cli-catalog.json
@@ -0,0 +1,5 @@
+{
+  "version" : "v1",
+  "lastUpdate" : "08/10/2024 17:28:52",
+  "plugins" : { }
+}
diff --git a/README.md b/README.md
@@ -10,8 +10,8 @@ Samples folder has examples on how to use the connector - [solace-connector-samp
 
 ## Documentation
 
-The documentation for this extension should be maintained as part of this repository and it is stored in the `docs/` directory.
 
+The documentation for this extension should be maintained as part of this repository, and it is stored in the `docs/` directory. Documentation is hosted in GitHub pages. Link to  [Solace Quarkus Documentation](https://solacelabs.github.io/solace-quarkus/).
 ## Running the extension
 
 ```quarkus build``` to build the extension. Please note that docker should be up & running to run the tests during build process

diff --git a/docs/modules/ROOT/pages/includes/quarkus-solace.adoc b/docs/modules/ROOT/pages/includes/quarkus-solace.adoc
@@ -10,7 +10,7 @@ h|[[quarkus-solace_configuration]]link:#quarkus-solace_configuration[Configurati
 h|Type
 h|Default
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.metrics.enabled]]`link:#quarkus-solace_quarkus.solace.metrics.enabled[quarkus.solace.metrics.enabled]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-metrics-enabled]]`link:#quarkus-solace_quarkus-solace-metrics-enabled[quarkus.solace.metrics.enabled]`
 
 
 [.description]
@@ -27,7 +27,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.health.enabled]]`link:#quarkus-solace_quarkus.solace.health.enabled[quarkus.solace.health.enabled]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-health-enabled]]`link:#quarkus-solace_quarkus-solace-health-enabled[quarkus.solace.health.enabled]`
 
 
 [.description]
@@ -44,7 +44,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.enabled]]`link:#quarkus-solace_quarkus.solace.devservices.enabled[quarkus.solace.devservices.enabled]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-enabled]]`link:#quarkus-solace_quarkus-solace-devservices-enabled[quarkus.solace.devservices.enabled]`
 
 
 [.description]
@@ -63,7 +63,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.image-name]]`link:#quarkus-solace_quarkus.solace.devservices.image-name[quarkus.solace.devservices.image-name]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-image-name]]`link:#quarkus-solace_quarkus-solace-devservices-image-name[quarkus.solace.devservices.image-name]`
 
 
 [.description]
@@ -80,7 +80,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.shared]]`link:#quarkus-solace_quarkus.solace.devservices.shared[quarkus.solace.devservices.shared]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-shared]]`link:#quarkus-solace_quarkus-solace-devservices-shared[quarkus.solace.devservices.shared]`
 
 
 [.description]
@@ -101,7 +101,7 @@ endif::add-copy-button-to-env-var[]
 |`true`
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.service-name]]`link:#quarkus-solace_quarkus.solace.devservices.service-name[quarkus.solace.devservices.service-name]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-service-name]]`link:#quarkus-solace_quarkus-solace-devservices-service-name[quarkus.solace.devservices.service-name]`
 
 
 [.description]
@@ -120,7 +120,7 @@ endif::add-copy-button-to-env-var[]
 |`solace`
 
 
-a| [[quarkus-solace_quarkus.solace.host]]`link:#quarkus-solace_quarkus.solace.host[quarkus.solace.host]`
+a| [[quarkus-solace_quarkus-solace-host]]`link:#quarkus-solace_quarkus-solace-host[quarkus.solace.host]`
 
 
 [.description]
@@ -137,7 +137,7 @@ endif::add-copy-button-to-env-var[]
 |required icon:exclamation-circle[title=Configuration property is required]
 
 
-a| [[quarkus-solace_quarkus.solace.vpn]]`link:#quarkus-solace_quarkus.solace.vpn[quarkus.solace.vpn]`
+a| [[quarkus-solace_quarkus-solace-vpn]]`link:#quarkus-solace_quarkus-solace-vpn[quarkus.solace.vpn]`
 
 
 [.description]
@@ -154,7 +154,7 @@ endif::add-copy-button-to-env-var[]
 |required icon:exclamation-circle[title=Configuration property is required]
 
 
-a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus.solace.devservices.container-env-container-env]]`link:#quarkus-solace_quarkus.solace.devservices.container-env-container-env[quarkus.solace.devservices.container-env]`
+a|icon:lock[title=Fixed at build time] [[quarkus-solace_quarkus-solace-devservices-container-env-container-env]]`link:#quarkus-solace_quarkus-solace-devservices-container-env-container-env[quarkus.solace.devservices.container-env]`
 
 
 [.description]
@@ -171,7 +171,7 @@ endif::add-copy-button-to-env-var[]
 |
 
 
-a| [[quarkus-solace_quarkus.solace-extra]]`link:#quarkus-solace_quarkus.solace-extra[quarkus.solace]`
+a| [[quarkus-solace_quarkus-solace-extra]]`link:#quarkus-solace_quarkus-solace-extra[quarkus.solace]`
 
 
 [.description]

diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc
@@ -25,7 +25,7 @@ For instance, with Maven, add the following dependency to your POM file:
 <dependency>
     <groupId>com.solace.quarkus</groupId>
     <artifactId>quarkus-solace-client</artifactId>
-    <version>{project-version}</version>
+    <version>3.0.0</version>
 </dependency>
 ----
 
@@ -42,10 +42,12 @@ For instance, with Maven, add the following dependency to your POM file:
 <dependency>
     <groupId>com.solace.quarkus</groupId>
     <artifactId>quarkus-solace-messaging-connector</artifactId>
-    <version>{project-version}</version>
+    <version>3.0.0</version>
 </dependency>
 ----
 
+NOTE: Solace Quarkus Extension 3.0.0 is based on Quarkus 3.8.6 and support for Java 11 is deprecated in Quarkus 3.8.6. Solace Quarkus Extension uses Java 17 as baseline.
+
 [[extension-configuration-reference]]
 == Extension Configuration Reference
 

diff --git a/pom.xml b/pom.xml
@@ -33,10 +33,10 @@
 		<next-revision>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}</next-revision>
 
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus.version>3.2.8.Final</quarkus.version>
+    <quarkus.version>3.8.6</quarkus.version>
 
     <solace.version>1.4.0</solace.version>
 

diff --git a/.../runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceAttributeExtractor.java b/.../runtime/src/main/java/com/solace/quarkus/messaging/tracing/SolaceAttributeExtractor.java
@@ -33,10 +33,10 @@ public String getSystem(final SolaceTrace solaceTrace) {
             return "SolacePubSub+";
         }
 
-        @Override
-        public String getDestinationKind(SolaceTrace solaceTrace) {
-            return solaceTrace.getDestinationKind();
-        }
+        //        @Override
+        //        public String getDestinationKind(SolaceTrace solaceTrace) {
+        //            return solaceTrace.getDestinationKind();
+        //        }
 
         @Override
         public String getDestination(final SolaceTrace solaceTrace) {

diff --git a/...e/src/main/java/com/solace/quarkus/messaging/tracing/SolaceOpenTelemetryInstrumenter.java b/...e/src/main/java/com/solace/quarkus/messaging/tracing/SolaceOpenTelemetryInstrumenter.java
@@ -28,7 +28,7 @@ public static SolaceOpenTelemetryInstrumenter createForOutgoing() {
     }
 
     private static SolaceOpenTelemetryInstrumenter createInstrumenter(boolean incoming) {
-        MessageOperation messageOperation = incoming ? MessageOperation.RECEIVE : MessageOperation.SEND;
+        MessageOperation messageOperation = incoming ? MessageOperation.RECEIVE : MessageOperation.PUBLISH;
 
         SolaceAttributeExtractor myExtractor = new SolaceAttributeExtractor();
         MessagingAttributesGetter<SolaceTrace, Void> attributesGetter = myExtractor.getMessagingAttributesGetter();