HBX-2883: Replace the deprecated JdbcSettings constants

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

jbt/src/main/java/org/hibernate/tool/orm/jbt/internal/factory/EnvironmentWrapperFactory.java

@@ -18,21 +18,21 @@ private static class EnvironmentWrapperImpl
 
 		@Override public String getTransactionManagerStrategy() { return "hibernate.transaction.coordinator_class"; }
 
-		@Override public  String getDriver() { return Environment.DRIVER; }
+		@Override public  String getDriver() { return Environment.JAKARTA_JDBC_DRIVER; }
 
 		@Override public  String getHBM2DDLAuto() { return Environment.HBM2DDL_AUTO; }
 
 		@Override public  String getDialect() { return Environment.DIALECT; }
 
-		@Override public  String getDataSource() { return Environment.DATASOURCE; }
+		@Override public  String getDataSource() { return Environment.JAKARTA_JTA_DATASOURCE; }
 
 		@Override public  String getConnectionProvider() { return Environment.CONNECTION_PROVIDER; }
 
-		@Override public  String getURL() { return Environment.URL; }
+		@Override public  String getURL() { return Environment.JAKARTA_JDBC_URL; }
 
-		@Override public  String getUser() { return Environment.USER; }
+		@Override public  String getUser() { return Environment.JAKARTA_JDBC_USER; }
 
-		@Override public  String getPass() { return Environment.PASS; }
+		@Override public  String getPass() { return Environment.JAKARTA_JDBC_PASSWORD; }
 
 		@Override public  String getSessionFactoryName() { return Environment.SESSION_FACTORY_NAME; }
 

jbt/src/test/java/org/hibernate/tool/orm/jbt/api/wrp/EnvironmentWrapperTest.java

@@ -30,7 +30,7 @@ public void testGetTransactionManagerStrategy() {
 
 	@Test
 	public void testGetDriver() {
-		assertEquals("hibernate.connection.driver_class", environmentWrapper.getDriver());
+		assertEquals("jakarta.persistence.jdbc.driver", environmentWrapper.getDriver());
 	}
 
 	@Test
@@ -45,7 +45,7 @@ public void testGetDialect() {
 
 	@Test
 	public void testGetDataSource() {
-		assertEquals("hibernate.connection.datasource", environmentWrapper.getDataSource());
+		assertEquals("jakarta.persistence.jtaDataSource", environmentWrapper.getDataSource());
 	}
 
 	@Test
@@ -55,17 +55,17 @@ public void testGetConnectionProvider() {
 
 	@Test
 	public void testGetURL() {
-		assertEquals("hibernate.connection.url", environmentWrapper.getURL());
+		assertEquals("jakarta.persistence.jdbc.url", environmentWrapper.getURL());
 	}
 
 	@Test
 	public void testGetUser() {
-		assertEquals("hibernate.connection.username", environmentWrapper.getUser());
+		assertEquals("jakarta.persistence.jdbc.user", environmentWrapper.getUser());
 	}
 
 	@Test
 	public void testGetPass() {
-		assertEquals("hibernate.connection.password", environmentWrapper.getPass());
+		assertEquals("jakarta.persistence.jdbc.password", environmentWrapper.getPass());
 	}
 
 	@Test