Skip to content

Commit

Permalink
Merge pull request quarkusio#44513 from xstefank/lra-separation
Browse files Browse the repository at this point in the history
Move narayana-lra extension to the new separated LRA project
  • Loading branch information
gsmet authored Nov 26, 2024
2 parents 2a5a167 + e74d9c7 commit 0ebd0ae
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 32 deletions.
35 changes: 9 additions & 26 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
<!-- See root POM for hibernate-orm.version, hibernate-reactive.version, hibernate-validator.version,
hibernate-search.version, antlr.version, bytebuddy.version, hibernate-commons-annotations.version -->
<narayana.version>7.1.0.Final</narayana.version>
<narayana-lra.version>0.0.9.Final</narayana-lra.version>
<agroal.version>2.5</agroal.version>
<jboss-transaction-spi.version>8.0.0.Final</jboss-transaction-spi.version>
<elasticsearch-opensource-components.version>8.16.1</elasticsearch-opensource-components.version>
Expand Down Expand Up @@ -4781,14 +4782,10 @@
<version>${microprofile-lra.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>narayana-lra</artifactId>
<version>${narayana.version}</version>
<version>${narayana-lra.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>narayana-lra</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand All @@ -4804,14 +4801,10 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-service-base</artifactId>
<version>${narayana.version}</version>
<version>${narayana-lra.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>lra-service-base</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Expand All @@ -4824,25 +4817,15 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-proxy-api</artifactId>
<version>${narayana.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>lra-proxy-api</artifactId>
</exclusion>
</exclusions>
<version>${narayana-lra.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-client</artifactId>
<version>${narayana.version}</version>
<version>${narayana-lra.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.narayana.rts</groupId>
<artifactId>lra-client</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
Expand Down
12 changes: 6 additions & 6 deletions extensions/narayana-lra/runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>narayana-lra</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-service-base</artifactId>
<exclusions>
<exclusion>
Expand All @@ -34,7 +34,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-proxy-api</artifactId>
<exclusions>
<exclusion>
Expand All @@ -44,7 +44,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.narayana.rts</groupId>
<groupId>org.jboss.narayana.lra</groupId>
<artifactId>lra-client</artifactId>
</dependency>
<dependency>
Expand All @@ -69,11 +69,11 @@
<configuration>
<removedResources>
<artifact>
<key>org.jboss.narayana.rts:narayana-lra</key>
<key>org.jboss.narayana.lra:narayana-lra</key>
<resources>META-INF/services/jakarta.ws.rs.client.ClientBuilder</resources>
</artifact>
<artifact>
<key>org.jboss.narayana.rts:lra-client</key>
<key>org.jboss.narayana.lra:lra-client</key>
<resources>META-INF/services/jakarta.ws.rs.client.ClientBuilder</resources>
</artifact>
</removedResources>
Expand Down

0 comments on commit 0ebd0ae

Please sign in to comment.