From cce38fdfba9f94eb9d91a5d6a4900d9b32cc7bc8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 2 Feb 2025 11:12:15 +0000 Subject: [PATCH 1/2] Bump javax.transaction:javax.transaction-api from 1.2 to 1.3 Bumps [javax.transaction:javax.transaction-api](https://github.com/javaee/javax.transaction) from 1.2 to 1.3. - [Commits](https://github.com/javaee/javax.transaction/compare/1.2...javax.transaction-api-1.3) --- updated-dependencies: - dependency-name: javax.transaction:javax.transaction-api dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- blueprint/plugin/blueprint-maven-plugin/pom.xml | 2 +- transaction/transaction-blueprint/pom.xml | 2 +- transaction/transaction-itests/pom.xml | 2 +- transaction/transaction-testbundle/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blueprint/plugin/blueprint-maven-plugin/pom.xml b/blueprint/plugin/blueprint-maven-plugin/pom.xml index 589812ef9f..b22fa4a7e5 100644 --- a/blueprint/plugin/blueprint-maven-plugin/pom.xml +++ b/blueprint/plugin/blueprint-maven-plugin/pom.xml @@ -45,7 +45,7 @@ 1.2 1.3.2 1 - 1.2 + 1.3 1.2-b03 3.4.0 3.15.1 diff --git a/transaction/transaction-blueprint/pom.xml b/transaction/transaction-blueprint/pom.xml index ec09dbfec4..b49284304d 100644 --- a/transaction/transaction-blueprint/pom.xml +++ b/transaction/transaction-blueprint/pom.xml @@ -52,7 +52,7 @@ 1.1.0 3.3.1 - 1.2 + 1.3 5.1.9 1.0.0 1.1.3 diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index 402b5861f3..dceaf0f0f2 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -49,7 +49,7 @@ 1.1 3.0.0 1.2 - 1.2 + 1.3 1.0.0 1.4.4 1.0.6 diff --git a/transaction/transaction-testbundle/pom.xml b/transaction/transaction-testbundle/pom.xml index e339a5ad56..ff0934d934 100644 --- a/transaction/transaction-testbundle/pom.xml +++ b/transaction/transaction-testbundle/pom.xml @@ -50,7 +50,7 @@ org.apache.aries.transaction.test.impl - 1.2 + 1.3 1.0.2 From 391eb70942e6a882849619c20187d6094e303c7c Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Thu, 13 Feb 2025 20:02:17 +0100 Subject: [PATCH 2/2] [MAINTENANCE] Expose javax.transaction.xa from system bundle and add javax.resource --- transaction/transaction-itests/pom.xml | 10 +++++++++- .../transaction/itests/AbstractIntegrationTest.java | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/transaction/transaction-itests/pom.xml b/transaction/transaction-itests/pom.xml index dceaf0f0f2..4a903106b3 100644 --- a/transaction/transaction-itests/pom.xml +++ b/transaction/transaction-itests/pom.xml @@ -49,6 +49,7 @@ 1.1 3.0.0 1.2 + 1.7.1 1.3 1.0.0 1.4.4 @@ -142,6 +143,13 @@ javax.interceptor-api ${javax.interceptor-api.version} + + + javax.resource + javax.resource-api + ${javax.resource-api.version} + + org.apache.servicemix.bundles org.apache.servicemix.bundles.javax-inject @@ -225,7 +233,7 @@ org.ops4j.pax.exam - pax-exam-container-forked + pax-exam-container-native ${exam.version} test diff --git a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java index 12462b33de..69db814443 100644 --- a/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java +++ b/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java @@ -73,7 +73,7 @@ public Option baseOptions() { new CleanCachesOption(true), // change to 'false' if investigation is needed // this is how you set the default log level when using pax // logging (logProfile) - systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), + systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"), // this option helps with debugging //vmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5006"), when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo)) @@ -85,7 +85,8 @@ public Option[] configuration() { return new Option[] { baseOptions(), frameworkProperty("org.osgi.framework.system.packages") - .value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"), + .value("javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers" + +",javax.transaction.xa;version=1.1"), systemProperty("org.apache.aries.proxy.weaving.enabled").value("none"), systemProperty("pax.exam.osgi.unresolved.fail").value("true"), @@ -127,6 +128,7 @@ private Option jta12Bundles() { mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.javax-inject").versionAsInProject(), mavenBundle("javax.el", "javax.el-api").versionAsInProject(), mavenBundle("javax.enterprise", "cdi-api").versionAsInProject(), + mavenBundle("javax.resource", "javax.resource-api").versionAsInProject(), mavenBundle("javax.transaction", "javax.transaction-api").versionAsInProject() ); }