HHH-19738 mask out 'jakarta.persistence.jdbc.password'

Author: gavinking

hibernate-core/src/main/java/org/hibernate/cfg/Environment.java

@@ -144,7 +144,8 @@ public final class Environment implements AvailableSettings {
 			try (var stream = getResourceAsStream("/hibernate.properties")) {
 				try {
 					GLOBAL_PROPERTIES.load(stream);
-					LOG.propertiesLoaded( maskOut( GLOBAL_PROPERTIES, PASS ) );
+					LOG.propertiesLoaded( maskOut( GLOBAL_PROPERTIES,
+							PASS, JAKARTA_JDBC_PASSWORD, JPA_JDBC_PASSWORD ) );
 				}
 				catch (Exception e) {
 					LOG.unableToLoadProperties();

hibernate-core/src/main/java/org/hibernate/internal/util/config/ConfigurationHelper.java

@@ -270,21 +270,39 @@ else if ( configurationValues instanceof Properties properties ) {
 	}
 
 	/**
-	 * replace a property by a starred version
+	 * Replace a property by a starred version
 	 *
 	 * @param props properties to check
 	 * @param key property to mask
 	 *
 	 * @return cloned and masked properties
 	 */
 	public static Properties maskOut(Properties props, String key) {
-		final Properties clone = (Properties) props.clone();
+		final var clone = (Properties) props.clone();
 		if ( clone.get( key ) != null ) {
 			clone.setProperty( key, "****" );
 		}
 		return clone;
 	}
 
+	/**
+	 * Replace properties by starred version
+	 *
+	 * @param props properties to check
+	 * @param keys properties to mask
+	 *
+	 * @return cloned and masked properties
+	 */
+	public static Properties maskOut(Properties props, String... keys) {
+		final var clone = (Properties) props.clone();
+		for ( String key : keys ) {
+			if ( clone.get( key ) != null ) {
+				clone.setProperty( key, "****" );
+			}
+		}
+		return clone;
+	}
+
 	/**
 	 * Extract a property value by name from the given properties object.
 	 * <p>