Skip to content

Backport HSEARCH-4528 + HSEARCH-4529 to branch 6.1 - Upgrade Hibernate Commons Annotations and Jakarta dependencies for -orm6/-jakarta artifacts #2986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 4, 2022
Merged

Backport HSEARCH-4528 + HSEARCH-4529 to branch 6.1 - Upgrade Hibernate Commons Annotations and Jakarta dependencies for -orm6/-jakarta artifacts #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ac6cd9c
HSEARCH-4528 Add explicit dependencies to jakarta.transaction/jakarta…
yrodiere Apr 4, 2022
00dcf67
HSEARCH-4528 Bump jakarta.annotation-api from 2.0.0 to 2.1.0
dependabot[bot] Apr 4, 2022
735e592
HSEARCH-4528 Bump jakarta.transaction-api from 2.0.0 to 2.0.1
dependabot[bot] Apr 4, 2022
c013bd4
HSEARCH-4528 Upgrade to JBeret 2.0.4.Final for -orm6/-jakarta artifacts
yrodiere Apr 4, 2022
e16c2d4
HSEARCH-4528 Upgrade to IBM JBatch 2.1.0-M2 in tests
yrodiere Apr 4, 2022
6c14783
HSEARCH-4528 Bump jakarta.batch-api from 2.0.0 to 2.1.0
dependabot[bot] Mar 21, 2022
88271a1
HSEARCH-4528 Upgrade to jakarta enterprise CDI 3.0.1 for -orm6/-jakar…
yrodiere Apr 4, 2022
c4bb86c
HSEARCH-4528 Upgrade to Weld 4.0.3.Final for tests
yrodiere Apr 4, 2022
06e9573
HSEARCH-4529 Upgrade to Hibernate Commons Annotations 6.0.0.Final for…
yrodiere Apr 4, 2022
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
View file
Open in desktop
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
View file
Open in desktop
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
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,25 +271,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.0.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 @@ -321,14 +321,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.5.SP1</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.34</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