Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quarkus version upgrade to 3.8.6 #77

Merged
merged 12 commits into from
Oct 29, 2024
Merged
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions .quarkus/cli/plugins/quarkus-cli-catalog.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version" : "v1",
"lastUpdate" : "08/10/2024 17:28:52",
"plugins" : { }
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions docs/modules/ROOT/pages/includes/quarkus-solace.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand Down
6 changes: 4 additions & 2 deletions docs/modules/ROOT/pages/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
----

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading