Skip to content

Commit

Permalink
Adjust H2 config so it works with EclipseLink as well
Browse files Browse the repository at this point in the history
  • Loading branch information
BalusC committed Sep 16, 2024
1 parent e5966b3 commit 46310e9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
<test.wildfly.version>33.0.1.Final</test.wildfly.version> <!-- https://mvnrepository.com/artifact/org.wildfly.bom/wildfly -->
<test.glassfish.version>7.0.17</test.glassfish.version> <!-- https://mvnrepository.com/artifact/org.glassfish.main.distributions/glassfish -->
<test.tomee.version>9.1.3</test.tomee.version> <!-- https://mvnrepository.com/artifact/org.apache.tomee/apache-tomee -->
<test.wildfly-eclipselink.version>4.0.4</test.wildfly-eclipselink.version> <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink -->
<test.wildfly-eclipselink.version>5.0.0-B03</test.wildfly-eclipselink.version> <!-- https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink -->
<test.glassfish-hibernate.version>6.1.7.Final</test.glassfish-hibernate.version> <!-- https://mvnrepository.com/artifact/org.hibernate.orm/hibernate-core TODO: Hibernate 6.2.0 and newer somehow threw java.lang.ClassCircularityError: org/hibernate/jpa/internal/enhance/EnhancingClassTransformerImpl$Entry -->
<test.h2.version>1.4.200</test.h2.version> <!-- https://mvnrepository.com/artifact/com.h2database/h2 TODO: bump to 2.x once EclipseLink is compatible with it https://github.com/eclipse-ee4j/eclipselink/issues/1393 -->
<test.h2.version>2.3.232</test.h2.version> <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
<test.mysql-driver.version>8.0.33</test.mysql-driver.version> <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
<test.postgresql-driver.version>42.7.4</test.postgresql-driver.version> <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
<test.omnifaces.version>4.5.1</test.omnifaces.version> <!-- https://mvnrepository.com/artifact/org.omnifaces/omnifaces -->
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/WEB-INF/glassfish-resources.xml/h2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<resources>
<jdbc-resource jndi-name="java:app/OptimusFacesIT" pool-name="OptimusFacesIT" />
<jdbc-connection-pool name="OptimusFacesIT" res-type="javax.sql.DataSource" datasource-classname="org.h2.jdbcx.JdbcDataSource">
<property name="url" value="jdbc:h2:mem:test" />
<property name="url" value="jdbc:h2:mem:test;MODE=LEGACY" />
<property name="user" value="sa" />
<property name="password" value="sa" />
</jdbc-connection-pool>
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/WEB-INF/resources.xml/h2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<resources>
<Resource id="OptimusFacesIT" type="javax.sql.DataSource">
JdbcDriver org.h2.Driver
JdbcUrl jdbc:h2:mem:test
JdbcUrl jdbc:h2:mem:test;MODE=LEGACY
UserName sa
Password sa
jtaManaged = true
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/WEB-INF/wildfly-ds.xml/h2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-->
<datasources>
<datasource jta="true" jndi-name="java:/OptimusFacesIT" pool-name="OptimusFacesIT" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test</connection-url>
<connection-url>jdbc:h2:mem:test;MODE=LEGACY</connection-url>
<driver>h2</driver>
<security>
<user-name>sa</user-name>
Expand Down

0 comments on commit 46310e9

Please sign in to comment.