Skip to content

Commit

Permalink
[WFLY-15548] [WFLY-15446] transaction subsystem: jakarta namespance p…
Browse files Browse the repository at this point in the history
…review
  • Loading branch information
mmusgrov committed Jan 24, 2022
1 parent c99f9fa commit 7953213
Show file tree
Hide file tree
Showing 8 changed files with 175 additions and 2 deletions.
11 changes: 11 additions & 0 deletions ee-9/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,17 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-transactions-jakarta</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,17 @@
</license>
</licenses>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-transactions-jakarta</artifactId>
<licenses>
<license>
<name>GNU Lesser General Public License v2.1 or later</name>
<url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1-standalone.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-web-common-jakarta</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions ee-9/feature-pack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,10 @@
<groupId>org.wildfly.wildfly-http-client</groupId>
<artifactId>wildfly-http-transaction-client</artifactId>
</exclusion>
<exclusion>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-transactions-jakarta</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
12 changes: 12 additions & 0 deletions ee-9/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,18 @@
</exclusions>
</dependency>

<dependency>
<groupId>${ee.maven.groupId}</groupId>
<artifactId>wildfly-transactions-jakarta</artifactId>
<version>${ee.maven.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down
1 change: 1 addition & 0 deletions ee-9/source-transform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<module>ee-security</module>
<module>jaxrs</module>
<module>iiop-openjdk</module>
<module>transactions</module>
<module>jpa/spi</module>
<module>jpa/eclipselink</module>
<module>jpa/subsystem</module>
Expand Down
134 changes: 134 additions & 0 deletions ee-9/source-transform/transactions/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ JBoss, Home of Professional Open Source.
~ Copyright 2021, Red Hat, Inc., and individual contributors
~ as indicated by the @author tags. See the copyright.txt file in the
~ distribution for a full listing of individual contributors.
~
~ This is free software; you can redistribute it and/or modify it
~ under the terms of the GNU Lesser General Public License as
~ published by the Free Software Foundation; either version 2.1 of
~ the License, or (at your option) any later version.
~
~ This software is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
~ Lesser General Public License for more details.
~
~ You should have received a copy of the GNU Lesser General Public
~ License along with this software; if not, write to the Free
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-9-source-transform-parent</artifactId>
<!--
Maintain separation between the artifact id and the version to help prevent
merge conflicts between commits changing the GA and those changing the V.
-->
<version>27.0.0.Beta1-SNAPSHOT</version>
</parent>

<artifactId>wildfly-transactions-jakarta</artifactId>
<name>WildFly: Transaction Subsystem (Jakarta Namespace)</name>

<properties>
<transformer-input-dir>${project.basedir}/../../../../transactions</transformer-input-dir>
</properties>

<dependencies>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-controller</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-ee-jakarta</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>wildfly-iiop-openjdk</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.openjdk-orb</groupId>
<artifactId>openjdk-orb</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi-jakarta</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
<!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
projects that depend on this project.-->
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
<!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
projects that depend on this project.-->
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.resource</groupId>
<artifactId>jakarta.resource-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.transaction</groupId>
<artifactId>wildfly-transaction-client-jakarta</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.wildfly-http-client</groupId>
<artifactId>wildfly-http-transaction-client</artifactId>
</dependency>

<dependency>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
</dependency>
<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wildfly.security</groupId>
<artifactId>wildfly-elytron-security-manager</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables combine.children="append">
<ObjectStoreEnvironmentBean.objectStoreDir>${project.build.directory}/ObjectStore</ObjectStoreEnvironmentBean.objectStoreDir>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</exports>

<resources>
<artifact name="${org.wildfly:wildfly-transactions}"/>
<artifact name="\${org.wildfly:wildfly-transactions@module.jakarta.suffix@}"/>
</resources>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
<version.org.jboss.logmanager.commons-logging-jboss-logmanager>1.0.3.Final</version.org.jboss.logmanager.commons-logging-jboss-logmanager>
<version.org.jboss.metadata>14.0.0.Final</version.org.jboss.metadata>
<version.org.jboss.mod_cluster>1.4.4.Final</version.org.jboss.mod_cluster>
<version.org.jboss.narayana>5.12.4.Final</version.org.jboss.narayana>
<version.org.jboss.narayana>5.12.5.Final</version.org.jboss.narayana>
<version.org.jboss.openjdk-orb>8.1.9.Final</version.org.jboss.openjdk-orb>
<version.org.jboss.resteasy>4.7.4.Final</version.org.jboss.resteasy>
<version.org.jboss.seam.int>7.0.0.GA</version.org.jboss.seam.int>
Expand Down

0 comments on commit 7953213

Please sign in to comment.