From e90053626483ce635f6fcc9f621443174d7aa49d Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Sun, 13 Oct 2024 14:29:24 +0200 Subject: [PATCH] [MNG-8258] Change the fixed reproducible build outputTimestamp to 1 Feb 1980 The Maven used the year 2001 (beginning of 21st century). But the Gradle already use the 1 Feb 1980 for preserveFileTimestamps. The 1 Jan 1980 is a minimal date in Zip archive but the 1 Jan has some special treatment by Java that's why the Gradle team used the 1 Feb. See more detailed description in CONSTANT_TIME_FOR_ZIP_ENTRIES https://github.com/gradle/gradle/blob/master/platforms/core-runtime/files/src/main/java/org/gradle/api/internal/file/archive/ZipEntryConstants.java#L39 Signed-off-by: Sergey Ponomarev --- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 ++- .../src/main/resources/org/apache/maven/model/pom-4.1.0.xml | 3 ++- .../java/org/apache/maven/project/PomConstructionTest.java | 2 +- .../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 3 ++- .../src/main/resources/org/apache/maven/model/pom-4.1.0.xml | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index f971118ce42b..ff7738614f9e 100644 --- a/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -26,7 +26,8 @@ under the License. UTF-8 UTF-8 - 2001-01-01T00:00:00Z + + 1980-02-01T00:00:00Z diff --git a/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml b/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml index f971118ce42b..ff7738614f9e 100644 --- a/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml +++ b/maven-api-impl/src/main/resources/org/apache/maven/model/pom-4.1.0.xml @@ -26,7 +26,8 @@ under the License. UTF-8 UTF-8 - 2001-01-01T00:00:00Z + + 1980-02-01T00:00:00Z diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index a72825788114..5cc27d231346 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -1355,7 +1355,7 @@ private void testCompleteModel(PomTestWrapper pom) throws Exception { assertEquals("project-property", pom.getValue("properties[1]/itProperty")); assertEquals("UTF-8", pom.getValue("properties[1]/project.build.sourceEncoding")); assertEquals("UTF-8", pom.getValue("properties[1]/project.reporting.outputEncoding")); - assertEquals("2001-01-01T00:00:00Z", pom.getValue("properties[1]/project.build.outputTimestamp")); + assertEquals("1980-02-01T00:00:00Z", pom.getValue("properties[1]/project.build.outputTimestamp")); assertEquals(1, ((List) pom.getValue("dependencyManagement/dependencies")).size()); assertEquals("org.apache.maven.its", pom.getValue("dependencyManagement/dependencies[1]/groupId")); diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml index f971118ce42b..ff7738614f9e 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml @@ -26,7 +26,8 @@ under the License. UTF-8 UTF-8 - 2001-01-01T00:00:00Z + + 1980-02-01T00:00:00Z diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml index f971118ce42b..ff7738614f9e 100644 --- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml +++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.1.0.xml @@ -26,7 +26,8 @@ under the License. UTF-8 UTF-8 - 2001-01-01T00:00:00Z + + 1980-02-01T00:00:00Z