Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion jakarta/mapper/orm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,20 @@
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
doesn't include the dependency in its POM... -->
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
doesn't include the dependency in its POM... -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.common</groupId>
Expand Down
13 changes: 12 additions & 1 deletion orm6/mapper/orm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,20 @@
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
doesn't include the dependency in its POM... -->
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<!-- Necessary for jakarta.transaction, but unfortunately jakarta.transaction
doesn't include the dependency in its POM... -->
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate.common</groupId>
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
That's why we have two separate properties for jackson versions,
even though they may have the same value from time to time.
-->
<version.com.fasterxml.jackson.databind>2.13.2.1</version.com.fasterxml.jackson.databind>
<version.com.fasterxml.jackson.databind>2.13.2.2</version.com.fasterxml.jackson.databind>
<!-- Reactive-streams: used by the AWS SDK -->
<version.org.reactivestreams.reactive-streams>1.0.3</version.org.reactivestreams.reactive-streams>
<!-- slf4j: used by the AWS SDK -->
Expand All @@ -274,25 +274,25 @@
<version.org.hibernate.orm>6.0.0.Final</version.org.hibernate.orm>
<javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
<documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
<version.org.hibernate.commons.annotations.orm6>6.0.0.CR1</version.org.hibernate.commons.annotations.orm6>
<version.org.hibernate.commons.annotations.orm6>6.0.0.Final</version.org.hibernate.commons.annotations.orm6>
<version.jakarta.persistence>3.0.0</version.jakarta.persistence>

<!-- >>> JSR 352 -->
<version.javax.batch>1.0.1</version.javax.batch>
<version.jakarta.batch>2.0.0</version.jakarta.batch>
<version.jakarta.batch>2.1.0</version.jakarta.batch>
<version.org.jberet>1.4.6.Final</version.org.jberet>
<version.org.jberet.jakarta>2.0.2.Final</version.org.jberet.jakarta>
<version.org.jberet.jakarta>2.0.4.Final</version.org.jberet.jakarta>

<!-- >>> Java EE/Jakarta EE dependencies -->
<!-- Used in the JSR352 integration in particular, but also in the ORM integration (?) and various tests -->
<version.javax.inject>1</version.javax.inject>
<version.jakarta.inject-api>2.0.1</version.jakarta.inject-api>
<version.javax.enterprise>2.0</version.javax.enterprise>
<version.jakarta.enterprise>3.0.0</version.jakarta.enterprise>
<version.jakarta.enterprise>3.0.1</version.jakarta.enterprise>
<version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>1.0.2.Final</version.org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec>
<version.jakarta.annotation-api>2.0.0</version.jakarta.annotation-api>
<version.jakarta.annotation-api>2.1.0</version.jakarta.annotation-api>
<version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
<version.jakarta.transaction-api>2.0.0</version.jakarta.transaction-api>
<version.jakarta.transaction-api>2.0.1</version.jakarta.transaction-api>
<!-- We need dependency management on these ones to avoid dependency divergence created by our own dependencies
(Hibernate ORM, JBatch, ...).
Ideally, we should remove this dependency management when the dependencies fix their dependency divergence.
Expand Down Expand Up @@ -324,14 +324,14 @@
<version.org.apache.commons.math3>3.6.1</version.org.apache.commons.math3>
<version.org.apache.avro>1.11.0</version.org.apache.avro>
<version.org.jboss.weld>3.1.9.Final</version.org.jboss.weld>
<version.org.jboss.weld.jakarta>4.0.2.Final</version.org.jboss.weld.jakarta>
<version.org.jboss.weld.jakarta>4.0.3.Final</version.org.jboss.weld.jakarta>

<!-- >>> Performance tests -->
<version.org.openjdk.jmh>1.35</version.org.openjdk.jmh>

<!-- >>> JSR 352: JBatch runtime -->
<version.com.ibm.jbatch>1.0</version.com.ibm.jbatch>
<version.com.ibm.jbatch.jakarta>2.0.0</version.com.ibm.jbatch.jakarta>
<version.com.ibm.jbatch.jakarta>2.1.0-M2</version.com.ibm.jbatch.jakarta>
<version.org.apache.derby>10.13.1.1</version.org.apache.derby>

<!-- >>> JSR 352: JBeret SE dependencies -->
Expand Down