From 2c22e48773e700b2f3ff30ad26ec2f607e091d59 Mon Sep 17 00:00:00 2001 From: Shane Turner Date: Wed, 20 Nov 2024 11:50:05 -0400 Subject: [PATCH] Fix formatting of date in Release file regardless of locale --- .../internal/hosted/metadata/AptHostedMetadataFacet.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/nexus-repository-apt/src/main/java/org/sonatype/nexus/repository/apt/datastore/internal/hosted/metadata/AptHostedMetadataFacet.java b/plugins/nexus-repository-apt/src/main/java/org/sonatype/nexus/repository/apt/datastore/internal/hosted/metadata/AptHostedMetadataFacet.java index a0f98e20d3..24e10a15c3 100644 --- a/plugins/nexus-repository-apt/src/main/java/org/sonatype/nexus/repository/apt/datastore/internal/hosted/metadata/AptHostedMetadataFacet.java +++ b/plugins/nexus-repository-apt/src/main/java/org/sonatype/nexus/repository/apt/datastore/internal/hosted/metadata/AptHostedMetadataFacet.java @@ -26,7 +26,6 @@ import java.util.Optional; import java.util.OptionalInt; import java.util.Set; -import java.util.TimeZone; import java.util.stream.Collectors; import javax.inject.Inject; import javax.inject.Named; @@ -65,7 +64,6 @@ import org.apache.commons.lang3.time.DateFormatUtils; import static com.google.common.base.Preconditions.checkNotNull; -import static org.apache.http.protocol.HttpDateGenerator.PATTERN_RFC1123; import static org.sonatype.nexus.common.hash.HashAlgorithm.MD5; import static org.sonatype.nexus.common.hash.HashAlgorithm.SHA256; import static org.sonatype.nexus.repository.apt.internal.AptFacetHelper.normalizeAssetPath; @@ -78,6 +76,7 @@ import static org.sonatype.nexus.repository.apt.internal.ReleaseName.INRELEASE; import static org.sonatype.nexus.repository.apt.internal.ReleaseName.RELEASE; import static org.sonatype.nexus.repository.apt.internal.ReleaseName.RELEASE_GPG; +import static org.sonatype.nexus.repository.date.DateTimeUtils.formatDateTime; /** * Apt metadata facet. Holds the logic for metadata recalculation. @@ -305,7 +304,7 @@ private String buildReleaseFile( final String md5, final String sha256) { - String date = DateFormatUtils.format(new Date(), PATTERN_RFC1123, TimeZone.getTimeZone("GMT")); + String date = DateFormatUtils.formatDateTime(new Date()); Paragraph p = new Paragraph(Arrays.asList( new ControlFile.ControlField("Suite", distribution), new ControlFile.ControlField("Codename", distribution), new ControlFile.ControlField("Components", "main"),