Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7548] Kill off "legacy" repository metadata support (#1138)

This commit is contained in:
Guillaume Nodet 2023-06-05 10:45:36 +02:00 committed by GitHub
parent ea1a280714
commit 124033bc04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadata.java
View File

@ -38,19 +38,15 @@ final class LocalSnapshotMetadata extends MavenMetadata {
private final Collection<Artifact> artifacts = new ArrayList<>(); private final Collection<Artifact> artifacts = new ArrayList<>();
private final boolean legacyFormat; LocalSnapshotMetadata(Artifact artifact, Date timestamp) {
super(createMetadata(artifact), null, timestamp);
LocalSnapshotMetadata(Artifact artifact, boolean legacyFormat, Date timestamp) {
super(createMetadata(artifact, legacyFormat), null, timestamp);
this.legacyFormat = legacyFormat;
} }
LocalSnapshotMetadata(Metadata metadata, File file, boolean legacyFormat, Date timestamp) { LocalSnapshotMetadata(Metadata metadata, File file, Date timestamp) {
super(metadata, file, timestamp); super(metadata, file, timestamp);
this.legacyFormat = legacyFormat;
} }
private static Metadata createMetadata(Artifact artifact, boolean legacyFormat) { private static Metadata createMetadata(Artifact artifact) {
Snapshot snapshot = new Snapshot(); Snapshot snapshot = new Snapshot();
snapshot.setLocalCopy(true); snapshot.setLocalCopy(true);
Versioning versioning = new Versioning(); Versioning versioning = new Versioning();
@ -61,11 +57,7 @@ final class LocalSnapshotMetadata extends MavenMetadata {
metadata.setGroupId(artifact.getGroupId()); metadata.setGroupId(artifact.getGroupId());
metadata.setArtifactId(artifact.getArtifactId()); metadata.setArtifactId(artifact.getArtifactId());
metadata.setVersion(artifact.getBaseVersion()); metadata.setVersion(artifact.getBaseVersion());
metadata.setModelVersion("1.1.0");
if (!legacyFormat) {
metadata.setModelVersion("1.1.0");
}
return metadata; return metadata;
} }
@ -74,7 +66,7 @@ final class LocalSnapshotMetadata extends MavenMetadata {
} }
public MavenMetadata setFile(File file) { public MavenMetadata setFile(File file) {
return new LocalSnapshotMetadata(metadata, file, legacyFormat, timestamp); return new LocalSnapshotMetadata(metadata, file, timestamp);
} }
public Object getKey() { public Object getKey() {
@ -89,33 +81,31 @@ final class LocalSnapshotMetadata extends MavenMetadata {
protected void merge(Metadata recessive) { protected void merge(Metadata recessive) {
metadata.getVersioning().setLastUpdatedTimestamp(timestamp); metadata.getVersioning().setLastUpdatedTimestamp(timestamp);
if (!legacyFormat) { String lastUpdated = metadata.getVersioning().getLastUpdated();
String lastUpdated = metadata.getVersioning().getLastUpdated();
Map<String, SnapshotVersion> versions = new LinkedHashMap<>(); Map<String, SnapshotVersion> versions = new LinkedHashMap<>();
for (Artifact artifact : artifacts) { for (Artifact artifact : artifacts) {
SnapshotVersion sv = new SnapshotVersion(); SnapshotVersion sv = new SnapshotVersion();
sv.setClassifier(artifact.getClassifier()); sv.setClassifier(artifact.getClassifier());
sv.setExtension(artifact.getExtension()); sv.setExtension(artifact.getExtension());
sv.setVersion(getVersion()); sv.setVersion(getVersion());
sv.setUpdated(lastUpdated); sv.setUpdated(lastUpdated);
versions.put(getKey(sv.getClassifier(), sv.getExtension()), sv); versions.put(getKey(sv.getClassifier(), sv.getExtension()), sv);
} }
Versioning versioning = recessive.getVersioning(); Versioning versioning = recessive.getVersioning();
if (versioning != null) { if (versioning != null) {
for (SnapshotVersion sv : versioning.getSnapshotVersions()) { for (SnapshotVersion sv : versioning.getSnapshotVersions()) {
String key = getKey(sv.getClassifier(), sv.getExtension()); String key = getKey(sv.getClassifier(), sv.getExtension());
if (!versions.containsKey(key)) { if (!versions.containsKey(key)) {
versions.put(key, sv); versions.put(key, sv);
}
} }
} }
metadata.getVersioning().setSnapshotVersions(new ArrayList<>(versions.values()));
} }
metadata.getVersioning().setSnapshotVersions(new ArrayList<>(versions.values()));
artifacts.clear(); artifacts.clear();
} }

6
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
View File

@ -40,13 +40,9 @@ class LocalSnapshotMetadataGenerator implements MetadataGenerator {
private Map<Object, LocalSnapshotMetadata> snapshots; private Map<Object, LocalSnapshotMetadata> snapshots;
private final boolean legacyFormat;
private final Date timestamp; private final Date timestamp;
LocalSnapshotMetadataGenerator(RepositorySystemSession session, InstallRequest request) { LocalSnapshotMetadataGenerator(RepositorySystemSession session, InstallRequest request) {
legacyFormat = ConfigUtils.getBoolean(session.getConfigProperties(), false, "maven.metadata.legacy");
timestamp = (Date) ConfigUtils.getObject(session, new Date(), "maven.startTime"); timestamp = (Date) ConfigUtils.getObject(session, new Date(), "maven.startTime");
snapshots = new LinkedHashMap<>(); snapshots = new LinkedHashMap<>();
@ -58,7 +54,7 @@ class LocalSnapshotMetadataGenerator implements MetadataGenerator {
Object key = LocalSnapshotMetadata.getKey(artifact); Object key = LocalSnapshotMetadata.getKey(artifact);
LocalSnapshotMetadata snapshotMetadata = snapshots.get(key); LocalSnapshotMetadata snapshotMetadata = snapshots.get(key);
if (snapshotMetadata == null) { if (snapshotMetadata == null) {
snapshotMetadata = new LocalSnapshotMetadata(artifact, legacyFormat, timestamp); snapshotMetadata = new LocalSnapshotMetadata(artifact, timestamp);
snapshots.put(key, snapshotMetadata); snapshots.put(key, snapshotMetadata);
} }
snapshotMetadata.bind(artifact); snapshotMetadata.bind(artifact);

11
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java
View File

@ -34,18 +34,13 @@ abstract class MavenSnapshotMetadata extends MavenMetadata {
protected final Collection<Artifact> artifacts = new ArrayList<>(); protected final Collection<Artifact> artifacts = new ArrayList<>();
protected final boolean legacyFormat; protected MavenSnapshotMetadata(Metadata metadata, File file, Date timestamp) {
protected MavenSnapshotMetadata(Metadata metadata, File file, boolean legacyFormat, Date timestamp) {
super(metadata, file, timestamp); super(metadata, file, timestamp);
this.legacyFormat = legacyFormat;
} }
protected static Metadata createRepositoryMetadata(Artifact artifact, boolean legacyFormat) { protected static Metadata createRepositoryMetadata(Artifact artifact) {
Metadata metadata = new Metadata(); Metadata metadata = new Metadata();
if (!legacyFormat) { metadata.setModelVersion("1.1.0");
metadata.setModelVersion("1.1.0");
}
metadata.setGroupId(artifact.getGroupId()); metadata.setGroupId(artifact.getGroupId());
metadata.setArtifactId(artifact.getArtifactId()); metadata.setArtifactId(artifact.getArtifactId());
metadata.setVersion(artifact.getBaseVersion()); metadata.setVersion(artifact.getBaseVersion());

14
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
View File

@ -44,16 +44,16 @@ final class RemoteSnapshotMetadata extends MavenSnapshotMetadata {
private final Map<String, SnapshotVersion> versions = new LinkedHashMap<>(); private final Map<String, SnapshotVersion> versions = new LinkedHashMap<>();
RemoteSnapshotMetadata(Artifact artifact, boolean legacyFormat, Date timestamp) { RemoteSnapshotMetadata(Artifact artifact, Date timestamp) {
super(createRepositoryMetadata(artifact, legacyFormat), null, legacyFormat, timestamp); super(createRepositoryMetadata(artifact), null, timestamp);
} }
private RemoteSnapshotMetadata(Metadata metadata, File file, boolean legacyFormat, Date timestamp) { private RemoteSnapshotMetadata(Metadata metadata, File file, Date timestamp) {
super(metadata, file, legacyFormat, timestamp); super(metadata, file, timestamp);
} }
public MavenMetadata setFile(File file) { public MavenMetadata setFile(File file) {
return new RemoteSnapshotMetadata(metadata, file, legacyFormat, timestamp); return new RemoteSnapshotMetadata(metadata, file, timestamp);
} }
public String getExpandedVersion(Artifact artifact) { public String getExpandedVersion(Artifact artifact) {
@ -115,9 +115,7 @@ final class RemoteSnapshotMetadata extends MavenSnapshotMetadata {
} }
} }
if (!legacyFormat) { metadata.getVersioning().setSnapshotVersions(new ArrayList<>(versions.values()));
metadata.getVersioning().setSnapshotVersions(new ArrayList<>(versions.values()));
}
} }
private static int getBuildNumber(Metadata metadata) { private static int getBuildNumber(Metadata metadata) {

6
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
View File

@ -40,13 +40,9 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator {
private final Map<Object, RemoteSnapshotMetadata> snapshots; private final Map<Object, RemoteSnapshotMetadata> snapshots;
private final boolean legacyFormat;
private final Date timestamp; private final Date timestamp;
RemoteSnapshotMetadataGenerator(RepositorySystemSession session, DeployRequest request) { RemoteSnapshotMetadataGenerator(RepositorySystemSession session, DeployRequest request) {
legacyFormat = ConfigUtils.getBoolean(session, false, "maven.metadata.legacy");
timestamp = (Date) ConfigUtils.getObject(session, new Date(), "maven.startTime"); timestamp = (Date) ConfigUtils.getObject(session, new Date(), "maven.startTime");
snapshots = new LinkedHashMap<>(); snapshots = new LinkedHashMap<>();
@ -71,7 +67,7 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator {
Object key = RemoteSnapshotMetadata.getKey(artifact); Object key = RemoteSnapshotMetadata.getKey(artifact);
RemoteSnapshotMetadata snapshotMetadata = snapshots.get(key); RemoteSnapshotMetadata snapshotMetadata = snapshots.get(key);
if (snapshotMetadata == null) { if (snapshotMetadata == null) {
snapshotMetadata = new RemoteSnapshotMetadata(artifact, legacyFormat, timestamp); snapshotMetadata = new RemoteSnapshotMetadata(artifact, timestamp);
snapshots.put(key, snapshotMetadata); snapshots.put(key, snapshotMetadata);
} }
snapshotMetadata.bind(artifact); snapshotMetadata.bind(artifact);

3
maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
View File

@ -62,8 +62,7 @@ class RemoteSnapshotMetadataTest {
void gregorianCalendarIsUsed() { void gregorianCalendarIsUsed() {
String dateBefore = gregorianDate(); String dateBefore = gregorianDate();
RemoteSnapshotMetadata metadata = RemoteSnapshotMetadata metadata = new RemoteSnapshotMetadata(new DefaultArtifact("a:b:1-SNAPSHOT"), new Date());
new RemoteSnapshotMetadata(new DefaultArtifact("a:b:1-SNAPSHOT"), false, new Date());
metadata.merge(new Metadata()); metadata.merge(new Metadata());
String dateAfter = gregorianDate(); String dateAfter = gregorianDate();