Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MNG-8055] Ability to force build number #1415

Merged
merged 2 commits into from
Feb 16, 2024
Merged

[MNG-8055] Ability to force build number #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b67780
[MNG-8055] Ability to force build number
cstamas Feb 16, 2024
8719193
Fix
cstamas Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...r-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,22 @@ final class RemoteSnapshotMetadata extends MavenSnapshotMetadata {

private final Map<String, SnapshotVersion> versions = new LinkedHashMap<>();

RemoteSnapshotMetadata(Artifact artifact, boolean legacyFormat, Date timestamp) {
private final Integer buildNumber;

RemoteSnapshotMetadata(Artifact artifact, boolean legacyFormat, Date timestamp, Integer buildNumber) {
super(createRepositoryMetadata(artifact, legacyFormat), null, legacyFormat, timestamp);
this.buildNumber = buildNumber;
}

private RemoteSnapshotMetadata(Metadata metadata, File file, boolean legacyFormat, Date timestamp) {
private RemoteSnapshotMetadata(
Metadata metadata, File file, boolean legacyFormat, Date timestamp, Integer buildNumber) {
super(metadata, file, legacyFormat, timestamp);
this.buildNumber = buildNumber;
}

@Override
public MavenMetadata setFile(File file) {
return new RemoteSnapshotMetadata(metadata, file, legacyFormat, timestamp);
return new RemoteSnapshotMetadata(metadata, file, legacyFormat, timestamp, buildNumber);
}

public String getExpandedVersion(Artifact artifact) {
Expand All @@ -73,7 +78,7 @@ protected void merge(Metadata recessive) {
utcDateFormatter.setTimeZone(DEFAULT_SNAPSHOT_TIME_ZONE);

snapshot = new Snapshot();
snapshot.setBuildNumber(getBuildNumber(recessive) + 1);
snapshot.setBuildNumber(buildNumber != null ? buildNumber : getBuildNumber(recessive) + 1);
snapshot.setTimestamp(utcDateFormatter.format(timestamp));

Versioning versioning = new Versioning();
Expand Down
12 changes: 11 additions & 1 deletion ...r/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,20 @@ class RemoteSnapshotMetadataGenerator implements MetadataGenerator {

private final Date timestamp;

private final Integer buildNumber;

RemoteSnapshotMetadataGenerator(RepositorySystemSession session, DeployRequest request) {
legacyFormat = ConfigUtils.getBoolean(session, false, "maven.metadata.legacy");

timestamp = (Date) ConfigUtils.getObject(session, new Date(), "maven.startTime");
Object bn = ConfigUtils.getObject(session, null, "maven.buildNumber");
if (bn instanceof Integer) {
this.buildNumber = (Integer) bn;
} else if (bn instanceof String) {
this.buildNumber = Integer.valueOf((String) bn);
} else {
this.buildNumber = null;
}

snapshots = new LinkedHashMap<>();

Expand All @@ -72,7 +82,7 @@ public Collection<? extends Metadata> prepare(Collection<? extends Artifact> art
Object key = RemoteSnapshotMetadata.getKey(artifact);
RemoteSnapshotMetadata snapshotMetadata = snapshots.get(key);
if (snapshotMetadata == null) {
snapshotMetadata = new RemoteSnapshotMetadata(artifact, legacyFormat, timestamp);
snapshotMetadata = new RemoteSnapshotMetadata(artifact, legacyFormat, timestamp, buildNumber);
snapshots.put(key, snapshotMetadata);
}
snapshotMetadata.bind(artifact);
Expand Down
23 changes: 22 additions & 1 deletion ...ovider/src/test/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.junit.Before;
import org.junit.Test;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class RemoteSnapshotMetadataTest {
Expand Down Expand Up @@ -63,7 +64,7 @@ public void gregorianCalendarIsUsed() {
String dateBefore = gregorianDate();

RemoteSnapshotMetadata metadata =
new RemoteSnapshotMetadata(new DefaultArtifact("a:b:1-SNAPSHOT"), false, new Date());
new RemoteSnapshotMetadata(new DefaultArtifact("a:b:1-SNAPSHOT"), false, new Date(), null);
metadata.merge(new Metadata());

String dateAfter = gregorianDate();
Expand All @@ -75,4 +76,24 @@ public void gregorianCalendarIsUsed() {
Set<String> expected = new HashSet<>(Arrays.asList(dateBefore, dateAfter));
assertTrue("Expected " + datePart + " to be in " + expected, expected.contains(datePart));
}

@Test
public void buildNumberNotSet() {
RemoteSnapshotMetadata metadata =
new RemoteSnapshotMetadata(new DefaultArtifact("a:b:1-SNAPSHOT"), false, new Date(), null);
metadata.merge(new Metadata());

int buildNumber = metadata.metadata.getVersioning().getSnapshot().getBuildNumber();
assertEquals(1, buildNumber);
}

@Test
public void buildNumberSet() {
RemoteSnapshotMetadata metadata =
new RemoteSnapshotMetadata(new DefaultArtifact("a:b:1-SNAPSHOT"), false, new Date(), 42);
metadata.merge(new Metadata());

int buildNumber = metadata.metadata.getVersioning().getSnapshot().getBuildNumber();
assertEquals(42, buildNumber);
}
}
Loading