1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
|
Description: Makes the generated copyright headers reproducible
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
+++ b/make/jdk/src/classes/build/tools/cldrconverter/CopyrightHeaders.java
@@ -26,6 +26,7 @@
package build.tools.cldrconverter;
import java.util.Calendar;
+import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.TimeZone;
@@ -150,8 +151,14 @@
}
private static int getYear() {
- return new GregorianCalendar(TimeZone.getTimeZone("America/Los_Angeles"),
- Locale.US).get(Calendar.YEAR);
+ Date date = new Date();
+ if (System.getenv("SOURCE_DATE_EPOCH") != null) {
+ date = new Date(1000 * Long.valueOf(System.getenv("SOURCE_DATE_EPOCH")));
+ }
+
+ GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"), Locale.ENGLISH);
+ calendar.setTime(date);
+ return calendar.get(Calendar.YEAR);
}
// no instantiation
--- a/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java
+++ b/make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java
@@ -34,9 +34,13 @@
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.TimeZone;
import java.util.TreeMap;
import java.util.stream.Collectors;
import java.util.regex.Pattern;
@@ -266,8 +270,15 @@
+ "}";
private static String getOpenJDKCopyright() {
- int year = ZonedDateTime.now(ZoneId
- .of("America/Los_Angeles")).getYear();
+ Date date = new Date();
+ if (System.getenv("SOURCE_DATE_EPOCH") != null) {
+ date = new Date(1000 * Long.valueOf(System.getenv("SOURCE_DATE_EPOCH")));
+ }
+
+ GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"), Locale.ENGLISH);
+ calendar.setTime(date);
+
+ int year = calendar.get(Calendar.YEAR);
return String.format(Locale.US, COPYRIGHT, year);
}
|