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

bump: hibernate-core 6.3.1.Final (was 5.6.15.Final) #1020

Merged
merged 2 commits into from
Oct 12, 2023
+12 −12
Merged

bump: hibernate-core 6.3.1.Final (was 5.6.15.Final) #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c121a6
bump: hibernate-core 6.3.1.Final (was 5.6.15.Final)
scala-steward Sep 28, 2023
2eb9567
javax.persistence -> jakarta.persistence
johanandren Oct 4, 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
4 changes: 2 additions & 2 deletions examples/src/test/java/jdocs/jdbc/HibernateJdbcSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import akka.projection.jdbc.JdbcSession;
// #hibernate-session-imports
import org.hibernate.Session;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
import java.sql.Connection;
import java.sql.SQLException;

Expand Down
4 changes: 2 additions & 2 deletions examples/src/test/java/jdocs/jdbc/HibernateSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package jdocs.jdbc;

// #hibernate-factory-imports
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import jakarta.persistence.EntityManagerFactory;
import jakarta.persistence.Persistence;

// #hibernate-factory-imports

Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/java/jdocs/jdbc/JdbcProjectionDocExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;

// #jdbc-session-imports
import akka.projection.jdbc.JdbcSession;
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/java/jdocs/kafka/KafkaDocExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

import jdocs.jdbc.HibernateJdbcSession;

import javax.persistence.EntityManager;
import jakarta.persistence.EntityManager;

public interface KafkaDocExample {

Expand Down
8 changes: 4 additions & 4 deletions examples/src/test/resources/META-INF/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
version="2.0">
<persistence-unit name="akka-projection-hibernate">
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:hibernate-test;OPTIMIZE_REUSE_RESULTS=FALSE"/>
<property name="javax.persistence.jdbc.user" value="sa"/>
<property name="javax.persistence.jdbc.password" value=""/>
<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver"/>
<property name="jakarta.persistence.jdbc.url" value="jdbc:h2:mem:hibernate-test;OPTIMIZE_REUSE_RESULTS=FALSE"/>
<property name="jakarta.persistence.jdbc.user" value="sa"/>
<property name="jakarta.persistence.jdbc.password" value=""/>
<!-- field access, no setters -->
<property name="hibernate.default-access" value="field"/>
<!-- avoid lazy loading -->
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/docs/kafka/KafkaDocExample.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import akka.projection.scaladsl.SourceProvider
import akka.stream.scaladsl.Source
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import javax.persistence.EntityManager
import jakarta.persistence.EntityManager
import jdocs.jdbc.HibernateJdbcSession
import jdocs.jdbc.HibernateSessionFactory
import org.slf4j.LoggerFactory
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ object Dependencies {
}

object Examples {
val hibernate = "org.hibernate" % "hibernate-core" % "5.6.15.Final"
val hibernate = "org.hibernate" % "hibernate-core" % "6.3.1.Final"

val akkaPersistenceTyped = "com.typesafe.akka" %% "akka-persistence-typed" % Versions.akka
val akkaClusterShardingTyped = "com.typesafe.akka" %% "akka-cluster-sharding-typed" % Versions.akka
Expand Down