Remove unsupported Log4j2 rolling policy properties

Signed-off-by: hojooo <ghwn5833@gmail.com>

Author: hojooo

core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4j2LoggingSystemProperties.java

@@ -77,9 +77,7 @@ private void applyRollingPolicyProperties(PropertyResolver resolver) {
 		applyRollingPolicy(Log4j2RollingPolicySystemProperty.TIME_MODULATE, resolver, Boolean.class);
 		applyRollingPolicy(Log4j2RollingPolicySystemProperty.CRON_SCHEDULE, resolver);
 		applyRollingPolicy(Log4j2RollingPolicySystemProperty.FILE_NAME_PATTERN, resolver);
-		applyRollingPolicy(Log4j2RollingPolicySystemProperty.CLEAN_HISTORY_ON_START, resolver);
 		applyRollingPolicy(Log4j2RollingPolicySystemProperty.MAX_FILE_SIZE, resolver, DataSize.class);
-		applyRollingPolicy(Log4j2RollingPolicySystemProperty.TOTAL_SIZE_CAP, resolver, DataSize.class);
 		applyRollingPolicy(Log4j2RollingPolicySystemProperty.MAX_HISTORY, resolver);
 	}
 

core/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4j2RollingPolicySystemProperty.java

@@ -33,21 +33,11 @@ public enum Log4j2RollingPolicySystemProperty {
 	 */
 	FILE_NAME_PATTERN("file-name-pattern", "logging.pattern.rolling-file-name"),
 
-	/**
-	 * Logging system property for the clean history on start flag.
-	 */
-	CLEAN_HISTORY_ON_START("clean-history-on-start", "logging.file.clean-history-on-start"),
-
 	/**
 	 * Logging system property for the file log max size.
 	 */
 	MAX_FILE_SIZE("max-file-size", "logging.file.max-size"),
 
-	/**
-	 * Logging system property for the file total size cap.
-	 */
-	TOTAL_SIZE_CAP("total-size-cap", "logging.file.total-size-cap"),
-
 	/**
 	 * Logging system property for the file log max history.
 	 */

core/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -139,13 +139,6 @@
       "type": "java.util.List<java.lang.String>",
       "description": "Overriding configuration files used to create a composite configuration. Can be prefixed with 'optional:' to only load the override if it exists."
     },
-    {
-      "name": "logging.log4j2.rollingpolicy.clean-history-on-start",
-      "type": "java.lang.Boolean",
-      "description": "Whether to clean the archive log files on startup.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": false
-    },
     {
       "name": "logging.log4j2.rollingpolicy.cron.schedule",
       "type": "java.lang.String",
@@ -194,13 +187,6 @@
       "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
       "defaultValue": false
     },
-    {
-      "name": "logging.log4j2.rollingpolicy.total-size-cap",
-      "type": "org.springframework.util.unit.DataSize",
-      "description": "Total size of log backups to be kept.",
-      "sourceType": "org.springframework.boot.context.logging.LoggingApplicationListener",
-      "defaultValue": "0B"
-    },
     {
       "name": "logging.logback.rollingpolicy.clean-history-on-start",
       "type": "java.lang.Boolean",

core/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java

@@ -76,7 +76,6 @@
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.unit.DataSize;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
@@ -782,8 +781,6 @@ private String getRelativeClasspathLocation(String fileName) {
 	void rollingPolicySystemPropertiesAreApplied() {
 		this.environment.setProperty("logging.log4j2.rollingpolicy.max-file-size", "50MB");
 		this.environment.setProperty("logging.log4j2.rollingpolicy.max-history", "30");
-		this.environment.setProperty("logging.log4j2.rollingpolicy.clean-history-on-start", "true");
-		this.environment.setProperty("logging.log4j2.rollingpolicy.total-size-cap", "5GB");
 		this.environment.setProperty("logging.log4j2.rollingpolicy.file-name-pattern",
 				"${LOG_FILE}.%d{yyyy-MM-dd}.%i.log");
 		File file = new File(tmpDir(), "log4j2-test.log");
@@ -792,13 +789,9 @@ void rollingPolicySystemPropertiesAreApplied() {
 		this.loggingSystem.initialize(this.initializationContext, null, logFile);
 		String maxFileSize = System.getProperty("LOG4J2_ROLLINGPOLICY_MAX_FILE_SIZE");
 		String maxHistory = System.getProperty("LOG4J2_ROLLINGPOLICY_MAX_HISTORY");
-		String cleanHistoryOnStart = System.getProperty("LOG4J2_ROLLINGPOLICY_CLEAN_HISTORY_ON_START");
-		String totalSizeCap = System.getProperty("LOG4J2_ROLLINGPOLICY_TOTAL_SIZE_CAP");
 		String fileNamePattern = System.getProperty("LOG4J2_ROLLINGPOLICY_FILE_NAME_PATTERN");
 		assertThat(maxFileSize).isEqualTo(String.valueOf(50 * 1024 * 1024));
 		assertThat(maxHistory).isEqualTo("30");
-		assertThat(cleanHistoryOnStart).isEqualTo("true");
-		assertThat(totalSizeCap).isEqualTo(String.valueOf(DataSize.ofGigabytes(5).toBytes()));
 		assertThat(fileNamePattern).isEqualTo("${LOG_FILE}.%d{yyyy-MM-dd}.%i.log");
 	}
 

core/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4j2LoggingSystemPropertiesTests.java

@@ -62,9 +62,7 @@ void restoreSystemProperties() {
 	@Test
 	void appliesLog4j2RollingPolicyProperties() {
 		this.environment.setProperty("logging.log4j2.rollingpolicy.max-file-size", "50MB");
-		this.environment.setProperty("logging.log4j2.rollingpolicy.clean-history-on-start", "true");
 		this.environment.setProperty("logging.log4j2.rollingpolicy.max-history", "30");
-		this.environment.setProperty("logging.log4j2.rollingpolicy.total-size-cap", "10GB");
 		this.environment.setProperty("logging.log4j2.rollingpolicy.file-name-pattern", "test.%d{yyyy-MM-dd}.%i.log");
 		this.environment.setProperty("logging.log4j2.rollingpolicy.strategy", "time");
 		this.environment.setProperty("logging.log4j2.rollingpolicy.time-based.interval", "2");
@@ -75,9 +73,7 @@ void appliesLog4j2RollingPolicyProperties() {
 
 		assertThat(System.getProperties())
 			.containsEntry("LOG4J2_ROLLINGPOLICY_MAX_FILE_SIZE", String.valueOf(DataSize.ofMegabytes(50).toBytes()))
-			.containsEntry("LOG4J2_ROLLINGPOLICY_CLEAN_HISTORY_ON_START", "true")
 			.containsEntry("LOG4J2_ROLLINGPOLICY_MAX_HISTORY", "30")
-			.containsEntry("LOG4J2_ROLLINGPOLICY_TOTAL_SIZE_CAP", String.valueOf(DataSize.ofGigabytes(10).toBytes()))
 			.containsEntry("LOG4J2_ROLLINGPOLICY_FILE_NAME_PATTERN", "test.%d{yyyy-MM-dd}.%i.log")
 			.containsEntry("LOG4J2_ROLLINGPOLICY_STRATEGY", "time")
 			.containsEntry("LOG4J2_ROLLINGPOLICY_TIME_INTERVAL", "2")