This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e60c56714804f86529d0e6999b21b718c57b0c56 Author: Amos Feng <[email protected]> AuthorDate: Thu Feb 17 16:09:18 2022 +0800 Fix #3551 ban all non-canonical JTA specs artifacts --- extensions-jvm/bonita/runtime/pom.xml | 8 ++++++++ extensions-jvm/spark/runtime/pom.xml | 8 ++++++++ extensions-jvm/wordpress/runtime/pom.xml | 8 ++++++++ extensions/servicenow/runtime/pom.xml | 8 ++++++++ pom.xml | 8 ++++++++ 5 files changed, 40 insertions(+) diff --git a/extensions-jvm/bonita/runtime/pom.xml b/extensions-jvm/bonita/runtime/pom.xml index bd74753..0c115bb 100644 --- a/extensions-jvm/bonita/runtime/pom.xml +++ b/extensions-jvm/bonita/runtime/pom.xml @@ -59,12 +59,20 @@ <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.bind</groupId> <artifactId>jboss-jaxb-api_2.3_spec</artifactId> </dependency> + <dependency> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml index f585547..587c9c2 100644 --- a/extensions-jvm/spark/runtime/pom.xml +++ b/extensions-jvm/spark/runtime/pom.xml @@ -92,6 +92,10 @@ <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </exclusion> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -106,6 +110,10 @@ <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> </dependency> + <dependency> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions-jvm/wordpress/runtime/pom.xml b/extensions-jvm/wordpress/runtime/pom.xml index cac66cb..f95762d 100644 --- a/extensions-jvm/wordpress/runtime/pom.xml +++ b/extensions-jvm/wordpress/runtime/pom.xml @@ -59,12 +59,20 @@ <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.jboss.spec.javax.xml.bind</groupId> <artifactId>jboss-jaxb-api_2.3_spec</artifactId> </dependency> + <dependency> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/servicenow/runtime/pom.xml b/extensions/servicenow/runtime/pom.xml index 2c4ff50..a4ad778 100644 --- a/extensions/servicenow/runtime/pom.xml +++ b/extensions/servicenow/runtime/pom.xml @@ -64,6 +64,10 @@ <groupId>jakarta.xml.bind</groupId> <artifactId>jakarta.xml.bind-api</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -74,6 +78,10 @@ <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> </dependency> + <dependency> + <groupId>jakarta.transaction</groupId> + <artifactId>jakarta.transaction-api</artifactId> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 44086d6..d839fd3 100644 --- a/pom.xml +++ b/pom.xml @@ -666,9 +666,17 @@ <exclude>javax.enterprise:cdi-api</exclude><!-- use jakarta.enterprise:jakarta.enterprise.cdi-api instead --> <exclude>javax.servlet:servlet-api</exclude><!-- use jakarta.servlet:jakarta.servlet-api instead --> <exclude>javax.servlet:javax.servlet-api</exclude><!-- use jakarta.servlet:jakarta.servlet-api instead --> + <exclude>javax.transaction:jta</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> + <exclude>javax.transaction:javax.transaction-api</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> <exclude>log4j:log4j</exclude><!-- use org.jboss.logmanager:log4j-jboss-logmanager instead --> + <exclude>org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> + <exclude>org.jboss.spec.javax.transaction:jboss-transaction-api_1.3_spec</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> <exclude>org.apache.geronimo.specs:geronimo-jms_1.1_spec</exclude><!-- use jakarta.jms:jakarta.jms-api instead --> <exclude>org.apache.geronimo.specs:geronimo-jms_2.0_spec</exclude><!-- use jakarta.jms:jakarta.jms-api instead --> + <exclude>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> + <exclude>org.apache.geronimo.specs:geronimo-jta_1.1_spec</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> + <exclude>org.apache.geronimo.specs:geronimo-jta_1.2_spec</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> + <exclude>org.glassfish.main.transaction:javax.transaction</exclude><!-- use jakarta.transaction:jakarta.transaction-api instead --> <!-- Note that log4j-api should be always excluded and org.jboss.logmanager:log4j2-jboss-logmanager added instead --> <!-- so that the version of log4j-api prefered by log4j2-jboss-logmanager is used --> <exclude>org.apache.logging.log4j:log4j-core</exclude><!-- not needed on Quarkus -->
