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

Upgraded Hibernate to 5.5.7.Final. #3417

Merged
merged 1 commit into from
Sep 22, 2021
Merged

Upgraded Hibernate to 5.5.7.Final. #3417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<version.lib.guava>30.0-jre</version.lib.guava>
<version.lib.h2>1.4.200</version.lib.h2>
<version.lib.hamcrest>1.3</version.lib.hamcrest>
<version.lib.hibernate>5.4.29.Final</version.lib.hibernate>
<version.lib.hibernate>5.5.7.Final</version.lib.hibernate>
<version.lib.hikaricp>5.0.0</version.lib.hikaricp>
<version.lib.hystrix>1.5.18</version.lib.hystrix>
<version.lib.inject>1.0</version.lib.inject>
Expand Down
8 changes: 0 additions & 8 deletions ...i/hibernate-cdi/src/main/java/io/helidon/integrations/cdi/hibernate/CDISEJtaPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import javax.transaction.TransactionManager;
import javax.transaction.UserTransaction;

import org.dom4j.DocumentFactory;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform;

Expand All @@ -37,13 +36,6 @@
*/
@ApplicationScoped
public class CDISEJtaPlatform extends AbstractJtaPlatform {
static {
// this is needed for native image, since 21.0.0
// as the document factory gets initialized lazily and that causes
// native image to fail. This way we force eager initialization
DocumentFactory.getInstance();
}

private final TransactionManager transactionManager;

private final UserTransaction userTransaction;
Expand Down
2 changes: 0 additions & 2 deletions integrations/cdi/hibernate-cdi/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
requires jakarta.inject.api;
requires jakarta.enterprise.cdi.api;
requires org.hibernate.orm.core;
// needed only for native image, transitive dependency of hibernate-core
requires dom4j;

exports io.helidon.integrations.cdi.hibernate;

Expand Down
4 changes: 2 additions & 2 deletions .../integration/native-image/mp-2/src/main/resources/META-INF/microprofile-config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2019, 2020 Oracle and/or its affiliates.
# Copyright (c) 2019, 2021 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 @@ -22,4 +22,4 @@ features.print-details=true
javax.sql.DataSource.test.dataSource.url=jdbc:oracle:thin:@localhost:1521/XE
javax.sql.DataSource.test.dataSource.user=system
javax.sql.DataSource.test.dataSource.password=oracle
javax.sql.DataSource.test.dataSourceClassName=oracle.jdbc.xa.client.OracleXADataSource
javax.sql.DataSource.test.dataSourceClassName=oracle.jdbc.pool.OracleDataSource