Skip to content

Add stork module for LRA (required for JBTM-3987) #97

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.

Sign up for GitHub

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

Merged
mmusgrov merged 1 commit into from
Jun 23, 2025
Merged

Add stork module for LRA (required for JBTM-3987) #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions boms/common-expansion/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,44 @@
</exclusions>
</dependency>

<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-api</artifactId>
<version>${version.io.smallrye.smallrye-stork}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>


<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-core</artifactId>
<version>${version.io.smallrye.smallrye-stork}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-service-discovery-static-list</artifactId>
<version>${version.io.smallrye.smallrye-stork}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>


<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-amqp-client</artifactId>
Expand Down
15 changes: 15 additions & 0 deletions galleon-pack/galleon-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,21 @@
<artifactId>smallrye-health</artifactId>
</dependency>

<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-core</artifactId>
</dependency>

<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-api</artifactId>
</dependency>

<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-service-discovery-static-list</artifactId>
</dependency>

<dependency>
<groupId>io.smallrye</groupId>
<artifactId>smallrye-jwt</artifactId>
Expand Down
27 changes: 27 additions & 0 deletions ...on-shared/src/main/resources/modules/system/layers/base/io/smallrye/stork/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright The WildFly Authors
~ SPDX-License-Identifier: Apache-2.0
-->

<module xmlns="urn:jboss:module:1.9" name="io.smallrye.stork">

<properties>
<property name="jboss.api" value="private"/>
</properties>

<resources>
<artifact name="${io.smallrye.stork:stork-core}"/>
<artifact name="${io.smallrye.stork:stork-api}"/>
<artifact name="${io.smallrye.stork:stork-service-discovery-static-list}"/>
</resources>

<dependencies>
<module name="org.eclipse.microprofile.config.api" />
<module name="jakarta.enterprise.api" />
<module name="jakarta.annotation.api" />
<module name="org.jboss.logging" />
<module name="io.smallrye.config" services="import"/>
</dependencies>
</module>
1 change: 1 addition & 0 deletions ...sources/modules/system/layers/base/org/jboss/narayana/lra/lra-participant/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<!-- narayana-lra -->
<module name="org.eclipse.microprofile.config.api"/>
<module name="io.smallrye.config"/>
<module name="io.smallrye.stork"/>

<!-- Required for proper creation of proxies for CDI beans originating from this module -->
<module name="org.jboss.weld.api"/>
Expand Down
12 changes: 12 additions & 0 deletions microprofile/lra/participant/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-proxy-api</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-core</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-api</artifactId>
</dependency>
<dependency>
<groupId>io.smallrye.stork</groupId>
<artifactId>stork-service-discovery-static-list</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
Expand Down
1 change: 1 addition & 0 deletions .../microprofile/lra/participant/deployment/LRAParticipantDeploymentDependencyProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ private void addModuleDependencies(DeploymentUnit deploymentUnit) {
lraParticipantDependency.addImportFilter(PathFilters.getMetaInfFilter(), true);
moduleSpecification.addSystemDependency(lraParticipantDependency);
moduleSpecification.addSystemDependency(ModuleDependency.Builder.of(moduleLoader, "io.smallrye.jandex").setImportServices(true).build());
moduleSpecification.addSystemDependency(ModuleDependency.Builder.of(moduleLoader, "io.smallrye.stork").setImportServices(true).build());
moduleSpecification.addSystemDependency(ModuleDependency.Builder.of(moduleLoader, "org.jboss.as.weld.common").setImportServices(true).build());
moduleSpecification.addSystemDependency(ModuleDependency.Builder.of(moduleLoader, "org.jboss.resteasy.resteasy-cdi").setImportServices(true).build());

Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@
<version.io.smallrye.smallrye-mutiny-vertx>3.17.1</version.io.smallrye.smallrye-mutiny-vertx>
<version.io.smallrye.smallrye-mutiny-zero>1.1.1</version.io.smallrye.smallrye-mutiny-zero>
<version.io.smallrye.smallrye-opentelemetry>2.9.2</version.io.smallrye.smallrye-opentelemetry>
<version.io.smallrye.smallrye-stork>2.7.3</version.io.smallrye.smallrye-stork>
<version.io.smallrye.smallrye-reactive-messaging>4.25.0</version.io.smallrye.smallrye-reactive-messaging>
<version.io.undertow.jastow>2.2.8.Final</version.io.undertow.jastow>
<version.io.vertx.vertx>4.5.15</version.io.vertx.vertx>
Expand Down Expand Up @@ -485,7 +486,7 @@
<version.org.jboss.metadata>16.1.0.Final</version.org.jboss.metadata>
<version.org.jboss.mod_cluster>2.1.0.Final</version.org.jboss.mod_cluster>
<version.org.jboss.narayana>7.2.2.Final</version.org.jboss.narayana>
<version.org.jboss.narayana.lra>1.0.1.Final</version.org.jboss.narayana.lra>
<version.org.jboss.narayana.lra>1.0.2.Final-SNAPSHOT</version.org.jboss.narayana.lra>
Copy link
Member Author

@mmusgrov mmusgrov Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcosgopen We'll need to change this to a released version before merging our WildFly clone. And the released version won't work with WildFly until the WildFly MP LRA testsuite has been updated.

Copy link
Member

@marcosgopen marcosgopen Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider keeping this PR open and never merge it here. I would usually prefer to have it merged in wildfly main and then pull that change into our jboss-as repo.
+1 to change the version to a released one for the WildFly PR

Copy link
Member

@tomjenkinson tomjenkinson Jun 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to mention we can't keep the SNAPSHOT version in the main branch of our WildFly fork because it causes the Narayana build to fail (https://github.com/tomjenkinson/narayana/actions/runs/15850027491/job/44680987225). I will raise a pull request to set this back to 1.0.1.Final for now

Copy link
Member

@tomjenkinson tomjenkinson Jun 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have raised #98 - I hope it won't cause a problem to the rest of the changes here because the LRA changes proposed here related to stork module don't seem to necessarily (except for the functionality itself!) need a Narayana LRA version change for the stork module to be added

<version.org.jboss.openjdk-orb>10.1.1.Final</version.org.jboss.openjdk-orb>
<version.org.jboss.resteasy>6.2.12.Final</version.org.jboss.resteasy>
<version.org.jboss.resteasy.extensions>2.0.1.Final</version.org.jboss.resteasy.extensions>
Expand Down