Java 15439 PR to check failing test for modules fixed till date (#13150)

* JAVA-15439 Upgrade h2 database version - libraries-testing and deltaspike modules

* JAVA-15439 Fix for hibernate-queries,  hibernate-5,  java-jpa-2,  java-jpa-3 modules

* JAVA-15439 Fix for java-jpa, spring-jpa, spring-jpa-2 modules

* JAVA-15439 Revert changes for java-jpa-2 module

* JAVA-15439 Fix for core-java-persistence-2 and hibernate-exceptions modules

* JAVA-15439 Modules hibernate-mapping-2, read-only-transactions, log4j2, spring-data-eclipselink
This commit is contained in:
anuragkumawat 2022-12-20 23:17:29 +05:30 committed by GitHub
parent 456652e02b
commit 0e5e21f2ae
35 changed files with 52 additions and 52 deletions

View File

@ -189,7 +189,7 @@
<dbunit.version>2.7.0</dbunit.version>
<archunit.version>0.14.1</archunit.version>
<modelassert.version>1.0.0</modelassert.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -2,7 +2,7 @@ package com.baeldung.dbunit;
public class ConnectionSettings {
public static final String JDBC_DRIVER = org.h2.Driver.class.getName();
public static final String JDBC_URL = "jdbc:h2:mem:default;DB_CLOSE_DELAY=-1;init=runscript from 'classpath:dbunit/schema.sql'";
public static final String JDBC_URL = "jdbc:h2:mem:default;MODE=LEGACY;DB_CLOSE_DELAY=-1;init=runscript from 'classpath:dbunit/schema.sql'";
public static final String USER = "sa";
public static final String PASSWORD = "";
}

View File

@ -113,7 +113,7 @@
<commons-dbcp2.version>2.1.1</commons-dbcp2.version>
<log4j-core.version>2.17.1</log4j-core.version>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -16,7 +16,7 @@ public class ConnectionFactory {
private ConnectionFactory() {
dataSource = new BasicDataSource();
dataSource.setDriver(new Driver());
dataSource.setUrl("jdbc:h2:mem:db;DB_CLOSE_DELAY=-1");
dataSource.setUrl("jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;NON_KEYWORDS=WHEN");
}
public static Connection getConnection() throws SQLException {

View File

@ -79,7 +79,7 @@
<jooq.version>3.11.11</jooq.version>
<json.version>20220320</json.version>
<microstream.storage.version>07.00.00-MS-GA</microstream.storage.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ResultSet2JSONUnitTest {
JSONObject object = new JSONObject(
"{\"records\":[[\"doe1\",\"7173\",\"John\",\"Doe\"],[\"smith3\",\"3722\",\"Dana\",\"Smith\"],[\"john22\",\"5490\",\"John\",\"Wang\"]],\"fields\":[{\"schema\":\"PUBLIC\",\"name\":\"USERNAME\",\"type\":\"VARCHAR\",\"table\":\"WORDS\"},{\"schema\":\"PUBLIC\",\"name\":\"ID\",\"type\":\"VARCHAR\",\"table\":\"WORDS\"},{\"schema\":\"PUBLIC\",\"name\":\"First name\",\"type\":\"VARCHAR\",\"table\":\"WORDS\"},{\"schema\":\"PUBLIC\",\"name\":\"Last name\",\"type\":\"VARCHAR\",\"table\":\"WORDS\"}]}");
"{\"records\":[[\"doe1\",\"7173\",\"John\",\"Doe\"],[\"smith3\",\"3722\",\"Dana\",\"Smith\"],[\"john22\",\"5490\",\"John\",\"Wang\"]],\"fields\":[{\"schema\":\"PUBLIC\",\"name\":\"USERNAME\",\"type\":\"OTHER\",\"table\":\"WORDS\"},{\"schema\":\"PUBLIC\",\"name\":\"ID\",\"type\":\"OTHER\",\"table\":\"WORDS\"},{\"schema\":\"PUBLIC\",\"name\":\"First name\",\"type\":\"OTHER\",\"table\":\"WORDS\"},{\"schema\":\"PUBLIC\",\"name\":\"Last name\",\"type\":\"OTHER\",\"table\":\"WORDS\"}]}");
JSONArray array = new JSONArray(
"[{\"USERNAME\":\"doe1\",\"First name\":\"John\",\"ID\":\"7173\",\"Last name\":\"Doe\"},{\"USERNAME\":\"smith3\",\"First name\":\"Dana\",\"ID\":\"3722\",\"Last name\":\"Smith\"},{\"USERNAME\":\"john22\",\"First name\":\"John\",\"ID\":\"5490\",\"Last name\":\"Wang\"}]");
@ -43,7 +43,7 @@ public class ResultSet2JSONUnitTest {
@Test
void whenResultSetConvertedUsingJOOQDefaultApproach_shouldMatchJSON() throws SQLException, ClassNotFoundException {
Class.forName("org.h2.Driver");
Connection dbConnection = DriverManager.getConnection("jdbc:h2:mem:rs2jdbc2", "user", "password");
Connection dbConnection = DriverManager.getConnection("jdbc:h2:mem:rs2jdbc2;MODE=LEGACY", "user", "password");
// Create a table
Statement stmt = dbConnection.createStatement();
stmt.execute("CREATE TABLE words AS SELECT * FROM CSVREAD('./example.csv')");

View File

@ -293,7 +293,7 @@
<war.plugin.version>2.6</war.plugin.version>
<apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
<jandex.version>1.2.4.Final</jandex.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -28,7 +28,7 @@
<properties>
<!-- Configuring JDBC properties -->
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;NON_KEYWORDS=USER"/>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
<!-- Hibernate properties -->

View File

@ -39,7 +39,7 @@
<properties>
<hsqldb.version>2.4.0</hsqldb.version>
<jaxb.version>2.3.0</jaxb.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -15,7 +15,7 @@
<property name="hibernate.generate_statistics" value="false"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db3;DB_CLOSE_DELAY=-1"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db3;DB_CLOSE_DELAY=-1;NON_KEYWORDS=USER"/>
<property name="javax.persistence.jdbc.user" value="sa"/>
<property name="javax.persistence.jdbc.password" value=""/>
</properties>

View File

@ -81,7 +81,7 @@
<tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
<com.sun.xml.version>2.3.0.1</com.sun.xml.version>
<javax.xml.bind.version>2.3.1</javax.xml.bind.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -1,6 +1,6 @@
# jdbc.X
jdbc.driverClassName=org.h2.Driver
jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;MODE=LEGACY
jdbc.eventGeneratedId=sa
jdbc.user=sa
jdbc.pass=

View File

@ -6,7 +6,7 @@
<session-factory>
<property name="hibernate.connection.driver_class">org.h2.Driver</property>
<property name="hibernate.connection.password"></property>
<property name="hibernate.connection.url">jdbc:h2:mem:spring_hibernate_many_to_many</property>
<property name="hibernate.connection.url">jdbc:h2:mem:spring_hibernate_many_to_many;MODE=LEGACY</property>
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
<property name="hibernate.current_session_context_class">thread</property>

View File

@ -87,7 +87,7 @@
<tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
<mysql.version>6.0.6</mysql.version>
<mariaDB4j.version>2.2.3</mariaDB4j.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -39,8 +39,8 @@ public class HibernateScalarExample {
.list();
}
public Integer fetchAvgAgeWithScalar() {
return (Integer) session.createNativeQuery("SELECT AVG(age) as avgAge FROM Student student")
public Double fetchAvgAgeWithScalar() {
return (Double) session.createNativeQuery("SELECT AVG(age) as avgAge FROM Student student")
.addScalar("avgAge")
.uniqueResult();
}

View File

@ -73,7 +73,7 @@ public class HibernateScalarExampleUnitTest {
@Test
public void whenScalarUsedForAvgAge_ThenSingleValueReturned() {
Integer avgAge = scalarExample.fetchAvgAgeWithScalar();
Double avgAge = scalarExample.fetchAvgAgeWithScalar();
assertEquals(true, (avgAge >= 5 && avgAge <= 24));
}

View File

@ -6,7 +6,7 @@
<hibernate-configuration>
<session-factory>
<property name="hibernate.connection.driver_class">org.h2.Driver</property>
<property name="hibernate.connection.url">jdbc:h2:mem:testdb</property>
<property name="hibernate.connection.url">jdbc:h2:mem:testdb;MODE=LEGACY</property>
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.connection.password"></property>
<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>

View File

@ -1,5 +1,5 @@
hibernate.connection.driver_class=org.h2.Driver
hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/main/resources/init_database.sql'
hibernate.connection.url=jdbc:h2:mem:mydb1;MODE=LEGACY;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'src/main/resources/init_database.sql'
hibernate.connection.username=sa
hibernate.connection.autocommit=true
jdbc.password=

View File

@ -1,5 +1,5 @@
hibernate.connection.driver_class=org.h2.Driver
hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1
hibernate.connection.url=jdbc:h2:mem:mydb1;MODE=LEGACY;DB_CLOSE_DELAY=-1
hibernate.connection.username=sa
hibernate.connection.autocommit=true
jdbc.password=

View File

@ -57,10 +57,10 @@
</dependencies>
<properties>
<hibernate.version>5.4.12.Final</hibernate.version>
<hibernate.version>5.4.24.Final</hibernate.version>
<mysql.version>6.0.6</mysql.version>
<mariaDB4j.version>2.2.3</mariaDB4j.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -1,5 +1,5 @@
hibernate.connection.driver_class=org.h2.Driver
hibernate.connection.url=jdbc:h2:mem:lifecycledb;DB_CLOSE_DELAY=-1;
hibernate.connection.url=jdbc:h2:mem:lifecycledb;MODE=LEGACY;DB_CLOSE_DELAY=-1;
hibernate.connection.username=sa
hibernate.connection.password=
hibernate.connection.autocommit=true

View File

@ -1,5 +1,5 @@
hibernate.connection.driver_class=org.h2.Driver
hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1
hibernate.connection.url=jdbc:h2:mem:mydb1;MODE=LEGACY;DB_CLOSE_DELAY=-1
hibernate.connection.username=sa
hibernate.dialect=org.hibernate.dialect.H2Dialect

View File

@ -91,7 +91,7 @@
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-processor-plugin.version>3.3.3</maven-processor-plugin.version>
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -18,7 +18,7 @@ public class HibernateConfig {
Properties settings = new Properties();
settings.put(Environment.DRIVER, "org.h2.Driver");
settings.put(Environment.URL, "jdbc:h2:mem:test");
settings.put(Environment.URL, "jdbc:h2:mem:test;MODE=LEGACY");
settings.put(Environment.USER, "sa");
settings.put(Environment.PASS, "");
settings.put(Environment.DIALECT, "org.hibernate.dialect.H2Dialect");

View File

@ -67,7 +67,7 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;NON_KEYWORDS=USER"/>
<property name="javax.persistence.jdbc.user" value="sa"/>
<property name="javax.persistence.jdbc.password" value=""/>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
@ -104,7 +104,7 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:idGen"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:idGen;NON_KEYWORDS=USER;MODE=LEGACY"/>
<property name="javax.persistence.jdbc.user" value="sa"/>
<property name="javax.persistence.jdbc.password" value=""/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
@ -138,7 +138,7 @@
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test"/>
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:test;NON_KEYWORDS=USER"/>
<property name="javax.persistence.jdbc.user" value="sa"/>
<property name="javax.persistence.jdbc.password" value=""/>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>

View File

@ -107,7 +107,7 @@
<javax.persistence-api.version>2.2</javax.persistence-api.version>
<maven-processor-plugin.version>3.3.3</maven-processor-plugin.version>
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -15,7 +15,7 @@
<property name="javax.persistence.jdbc.driver"
value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url"
value="jdbc:h2:mem:test;INIT=RUNSCRIPT FROM 'classpath:database.sql'" />
value="jdbc:h2:mem:test;MODE=LEGACY;INIT=RUNSCRIPT FROM 'classpath:database.sql'" />
<property name="javax.persistence.jdbc.user" value="sa" />
<property name="javax.persistence.jdbc.password" value="" />
<property name="hibernate.dialect"
@ -37,7 +37,7 @@
<property name="javax.persistence.jdbc.driver"
value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url"
value="jdbc:h2:mem:test" />
value="jdbc:h2:mem:test;MODE=LEGACY" />
<property name="javax.persistence.jdbc.user" value="sa" />
<property name="javax.persistence.jdbc.password" value="" />
<property name="hibernate.dialect"
@ -80,7 +80,7 @@
<property name="javax.persistence.jdbc.driver"
value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url"
value="jdbc:h2:mem:entitygraphdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE" />
value="jdbc:h2:mem:entitygraphdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;NON_KEYWORDS=USER" />
<property
name="javax.persistence.schema-generation.database.action"

View File

@ -73,7 +73,7 @@
<spring-boot.version>2.6.1</spring-boot.version>
<spring-test.version>5.3.13</spring-test.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -20,7 +20,7 @@ public class Config {
@Bean("h2DataSource")
public DataSource dataSource() {
HikariConfig config = new HikariConfig();
config.setJdbcUrl("jdbc:h2:mem:mydb");
config.setJdbcUrl("jdbc:h2:mem:mydb;MODE=LEGACY");
config.setUsername("sa");
config.setPassword("");
config.setDriverClassName("org.h2.Driver");

View File

@ -66,7 +66,7 @@
<properties>
<spring.version>1.5.9.RELEASE</spring.version>
<eclipselink.version>2.7.0</eclipselink.version>
<h2.version>1.4.197</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -1,2 +1,2 @@
spring.datasource.url=jdbc:h2:mem:test;MVCC=FALSE;LOCK_TIMEOUT=100;
spring.datasource.url=jdbc:h2:mem:test;LOCK_TIMEOUT=100;
spring.jpa.show-sql=true

View File

@ -105,7 +105,7 @@
<spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<!-- persistence -->
<tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -1,18 +1,18 @@
CREATE TABLE course (
id bigint(20) NOT NULL,
id bigint auto_increment NOT NULL,
PRIMARY KEY (id)
);
CREATE TABLE student (
id bigint(20) NOT NULL,
id bigint auto_increment NOT NULL,
PRIMARY KEY (id)
);
CREATE TABLE course_like (
student_id bigint(20) NOT NULL,
course_id bigint(20) NOT NULL,
student_id bigint auto_increment NOT NULL,
course_id bigint auto_increment NOT NULL,
PRIMARY KEY (student_id, course_id),
CONSTRAINT fk_course_like__student FOREIGN KEY (student_id) REFERENCES student (id),
CONSTRAINT fk_course_like__course FOREIGN KEY (course_id) REFERENCES course (id)
@ -21,9 +21,9 @@ CREATE TABLE course_like (
CREATE TABLE course_rating (
course_id bigint(20) NOT NULL,
student_id bigint(20) NOT NULL,
rating int(11) NOT NULL,
course_id bigint auto_increment NOT NULL,
student_id bigint auto_increment NOT NULL,
rating int auto_increment NOT NULL,
PRIMARY KEY (course_id, student_id),
CONSTRAINT fk_course_rating__student FOREIGN KEY (student_id) REFERENCES student (id),
CONSTRAINT fk_course_rating__course FOREIGN KEY (course_id) REFERENCES course (id)
@ -32,11 +32,11 @@ CREATE TABLE course_rating (
CREATE TABLE course_registration (
id bigint(20) NOT NULL,
grade int(11),
id bigint auto_increment NOT NULL,
grade int auto_increment,
registered_at datetime NOT NULL,
course_id bigint(20) NOT NULL,
student_id bigint(20) NOT NULL,
course_id bigint auto_increment NOT NULL,
student_id bigint auto_increment NOT NULL,
PRIMARY KEY (id),
CONSTRAINT fk_course_registration__student FOREIGN KEY (student_id) REFERENCES student (id),
CONSTRAINT fk_course_registration__course FOREIGN KEY (course_id) REFERENCES course (id)

View File

@ -125,7 +125,7 @@
<hibernate-validator.version>6.0.15.Final</hibernate-validator.version>
<xml-apis.version>1.4.01</xml-apis.version>
<javax.el-api.version>2.2.5</javax.el-api.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.214</h2.version>
</properties>
</project>

View File

@ -1,5 +1,5 @@
jdbc.driverClassName=org.h2.Driver
jdbc.url=jdbc:h2:mem:myDb;DB_CLOSE_DELAY=-1
jdbc.url=jdbc:h2:mem:myDb;DB_CLOSE_DELAY=-1;NON_KEYWORDS=KEY,VALUE
hibernate.dialect=org.hibernate.dialect.H2Dialect
hibernate.show_sql=false