Skip to content
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

[4.x] Upgrades Hibernate to version 6.3.1.Final #7742

Merged
merged 4 commits into from
Oct 10, 2023
Merged

[4.x] Upgrades Hibernate to version 6.3.1.Final #7742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ceda75
Upgrades Hibernate to version 6.3.1.Final
ljnelson Oct 6, 2023
eb46fd8
Squashable commit; accounts for radical changes in Hibernate's DDL ge…
ljnelson Oct 6, 2023
07e9ee4
Squashable commit; removes version management of Byte Buddy per PR fe…
ljnelson Oct 9, 2023
74033f1
Squashable commit; removes unreferenced version properties from appli…
ljnelson Oct 9, 2023
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
17 changes: 0 additions & 17 deletions applications/mp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@

<properties>
<version.plugin.jandex>3.1.2</version.plugin.jandex>
<version.plugin.jaxb>0.14.0</version.plugin.jaxb>
<version.plugin.eclipselink>2.7.5.1</version.plugin.eclipselink>
<version.plugin.hibernate.enhance>6.1.7.Final</version.plugin.hibernate.enhance>
<mainClass>io.helidon.Main</mainClass>
</properties>

Expand All @@ -56,20 +53,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId>
<version>${version.plugin.hibernate.enhance}</version>
<dependencies>
<dependency>
<!-- Force upgrade byte-buddy for Java 21. -->
<!-- Remove after upgrading to Hibernate 6.2.7 -->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${version.lib.byte-buddy}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
6 changes: 6 additions & 0 deletions archetypes/helidon/src/main/archetype/mp/custom/database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
</list>
<list key="main-persistence-properties">
<map if="${..jpa-impl} == 'hibernate'">
<value key="name">hibernate.column_ordering_strategy</value>
<value key="value">legacy</value>
<value key="name">hibernate.dialect</value>
<value key="value">org.hibernate.dialect.H2Dialect</value>
</map>
Expand Down Expand Up @@ -293,6 +295,8 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
</list>
<list key="main-persistence-properties">
<map if="${..jpa-impl} == 'hibernate'">
<value key="name">hibernate.column_ordering_strategy</value>
<value key="value">legacy</value>
<value key="name">hibernate.dialect</value>
<value key="value">org.hibernate.dialect.MySQLDialect</value>
</map>
Expand Down Expand Up @@ -335,6 +339,8 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
</list>
<list key="main-persistence-properties">
<map if="${..jpa-impl} == 'hibernate'">
<value key="name">hibernate.column_ordering_strategy</value>
<value key="value">legacy</value>
<value key="name">hibernate.dialect</value>
<value key="value">org.hibernate.dialect.OracleDialect</value>
</map>
Expand Down
3 changes: 2 additions & 1 deletion ...don/src/main/archetype/mp/database/files/src/main/resources/hibernate.properties.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Byte code for JPA must be generated at compile time.
# This is a limitation of native image
hibernate.bytecode.provider=none
# No longer supported with Hibernate 6.3.x
# hibernate.bytecode.provider=none
4 changes: 1 addition & 3 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
<version.lib.animal-sniffer>1.18</version.lib.animal-sniffer>
<version.lib.annotation-api>1.3.5</version.lib.annotation-api>
<version.lib.brave-opentracing>1.0.0</version.lib.brave-opentracing>
<!-- Force upgrade byte-buddy for Java 21. Remove after upgrading hibernate to 6.2.7 -->
<version.lib.byte-buddy>1.14.6</version.lib.byte-buddy>
<version.lib.commons-logging>1.2</version.lib.commons-logging>
<version.lib.cron-utils>9.1.6</version.lib.cron-utils>
<version.lib.database.messaging>19.3.0.0</version.lib.database.messaging>
Expand All @@ -63,7 +61,7 @@
<version.lib.h2>2.2.220</version.lib.h2>
<version.lib.hamcrest>1.3</version.lib.hamcrest>
<version.lib.handlebars>4.3.1</version.lib.handlebars>
<version.lib.hibernate>6.1.7.Final</version.lib.hibernate>
<version.lib.hibernate>6.3.1.Final</version.lib.hibernate>
ljnelson marked this conversation as resolved.
Show resolved Hide resolved
<version.lib.hibernate-validator>7.0.2.Final</version.lib.hibernate-validator>
<version.lib.hikaricp>5.0.1</version.lib.hikaricp>
<version.lib.hystrix>1.5.18</version.lib.hystrix>
Expand Down
1 change: 1 addition & 0 deletions examples/integrations/cdi/pokemons/src/main/resources/META-INF/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<properties>
<property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create"/>
<property name="jakarta.persistence.sql-load-script-source" value="META-INF/init_script.sql"/>
<property name="hibernate.column_ordering_strategy" value="legacy"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
</properties>
</persistence-unit>
Expand Down
9 changes: 0 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,15 +635,6 @@
<groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId>
<version>${version.plugin.hibernate-enhance}</version>
<dependencies>
<dependency>
<!-- Force upgrade byte-buddy for Java 21. -->
<!-- Remove after upgrading to Hibernate 6.2.7 -->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${version.lib.byte-buddy}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
5 changes: 3 additions & 2 deletions tests/integration/jpa/appl/src/main/resources/hibernate.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
# Copyright (c) 2020, 2023 Oracle and/or its affiliates.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -16,4 +16,5 @@

# Byte code for JPA must be generated at compile time.
# This is a limitation of native image
hibernate.bytecode.provider=none
# No longer supported with Hibernate 6.3.x
# hibernate.bytecode.provider=none
3 changes: 2 additions & 1 deletion tests/integration/jpa/simple/src/test/resources/hibernate.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@

# Byte code for JPA must be generated at compile time.
# This is a limitation of native image
hibernate.bytecode.provider=none
# No longer supported with Hibernate 6.3.x
# hibernate.bytecode.provider=none