This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 8edd64a2 fix: use Gregorian year for generated NOTICE files (#885)
8edd64a2 is described below
commit 8edd64a2c1ec3257c9b9d776372889e381041960
Author: Efe <[email protected]>
AuthorDate: Sat Oct 31 19:05:09 2026 +0300
fix: use Gregorian year for generated NOTICE files (#885)
---
.../shade/resource/ApacheNoticeResourceTransformer.java | 5 ++++-
.../resource/ApacheNoticeResourceTransformerTest.java | 17 +++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
index 9671f78b..2060179d 100644
---
a/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
+++
b/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java
@@ -29,6 +29,7 @@ import java.util.Date;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -121,7 +122,9 @@ public class ApacheNoticeResourceTransformer extends
AbstractCompatibilityTransf
public void processResource(String resource, InputStream is,
List<Relocator> relocators, long time)
throws IOException {
if (entries.isEmpty()) {
- String year = copyrightYear != null ? copyrightYear : new
SimpleDateFormat("yyyy").format(new Date());
+ String year = copyrightYear != null
+ ? copyrightYear
+ : new SimpleDateFormat("yyyy", Locale.ROOT).format(new
Date());
if (!inceptionYear.equals(year)) {
year = inceptionYear + "-" + year;
}
diff --git
a/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java
b/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java
index 2e23eb2a..aa51b2ca 100644
---
a/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java
+++
b/src/test/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformerTest.java
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.shade.resource;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.time.Year;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
@@ -131,6 +132,22 @@ public class ApacheNoticeResourceTransformerTest {
String.join("", transformer.entries));
}
+ @Test
+ public void testDefaultCopyrightYearUsesGregorianCalendar() throws
IOException {
+ Locale previousFormatLocale =
Locale.getDefault(Locale.Category.FORMAT);
+ try {
+ Locale.setDefault(Locale.Category.FORMAT,
Locale.forLanguageTag("th-TH"));
+ transformer.processResource(
+ NOTICE_RESOURCE, new ByteArrayInputStream(new byte[0]),
Collections.<Relocator>emptyList(), 0);
+
+ String expectedYear = String.valueOf(Year.now().getValue());
+ assertTrue(String.join("", transformer.entries)
+ .contains("Copyright 2006-" + expectedYear + " The Apache
Software Foundation"));
+ } finally {
+ Locale.setDefault(Locale.Category.FORMAT, previousFormatLocale);
+ }
+ }
+
@Test
public void testDefaultCopyrightYearDoesNotOverrideTheConfiguredOne() {
transformer.copyrightYear = "2020";