HHH-11439 Switch from Geronimo JTA to Narayana JTA

This commit is contained in:
Sanne Grinovero 2016-11-23 10:57:14 +00:00 committed by Brett Meyer
parent 3f1111ee5c
commit 5e206666f0
5 changed files with 6 additions and 8 deletions

View File

@ -17,7 +17,7 @@
aries.transaction.howl.maxBlocksPerFile = 512 aries.transaction.howl.maxBlocksPerFile = 512
aries.transaction.howl.bufferSizeKBytes = 4 aries.transaction.howl.bufferSizeKBytes = 4
</config> </config>
<bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> <bundle dependency="true" start-level="30">mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.1.Final</bundle>
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/1.0.0</bundle> <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/1.0.0</bundle>
<bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle> <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>

View File

@ -9,7 +9,7 @@
<feature name="hibernate-test"> <feature name="hibernate-test">
<!-- JTA --> <!-- JTA -->
<bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> <bundle start-level="30">mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.1.Final</bundle>
<!-- JPA --> <!-- JPA -->
<bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle> <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>

View File

@ -11,7 +11,7 @@
<!--<feature>karaf-framework</feature>--> <!--<feature>karaf-framework</feature>-->
<!-- JTA --> <!-- JTA -->
<bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> <bundle start-level="30">mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.0.1.Final</bundle>
<!-- JPA --> <!-- JPA -->
<bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle> <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final</bundle>

View File

@ -178,8 +178,8 @@ karafFeatures {
} }
bundle { bundle {
match { match {
group = 'org.apache.geronimo.specs' group = 'org.jboss.spec.javax.transaction'
module = 'geronimo-jta_1.1_spec' module = 'jboss-transaction-api_1.2_spec'
} }
dependency = true dependency = true
} }

View File

@ -54,9 +54,7 @@ ext {
// javax // javax
jpa: 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final', jpa: 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final',
// There is a bug in the OSGi information in the JBoss one. See https://issues.jboss.org/browse/JBEE-160 jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final',
//jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.0.Final',
jta: 'org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1',
validation: 'javax.validation:validation-api:1.1.0.Final', validation: 'javax.validation:validation-api:1.1.0.Final',
jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final', jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',