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.

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

Upgrade prospero-metadata to 1.3.0.Beta2 #612

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Changes from all commits
Commits
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
Upgrade prospero-metadata to 1.3.0.Final
  • Loading branch information
TomasHofman committed Dec 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit f345548e8799b91ba96eb79356866bf9ce62fa86
Original file line number Diff line number Diff line change
@@ -186,8 +186,7 @@ private void resolveFromChannels(MavenArtifact artifact) throws UnresolvedMavenA

public void done(Path home) throws MavenUniverseException, IOException {
ChannelManifest channelManifest = channelSession.getRecordedChannel();
final ManifestVersionRecord currentVersions = new ManifestVersionResolver(localCachePath, system)
.getCurrentVersions(channels);
final ManifestVersionRecord currentVersions = ManifestVersionResolver.getCurrentVersions(channelSession);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for this change?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jamezp I deprecated the old method - it was relying on a hack I want to get rid of. The new method uses changed wildfly-channel API to achieve the same goal more cleanly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that was really @spyrkob 's request.

ProsperoMetadataUtils.generate(home, channels, channelManifest, currentVersions);
}

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@
<version.org.wildfly.launcher>1.0.0.Beta3</version.org.wildfly.launcher>
<version.org.wildfly>32.0.1.Final</version.org.wildfly>
<version.org.wildfly.channel>1.2.1.Final</version.org.wildfly.channel>
<version.org.wildfly.prospero>1.2.1.Final</version.org.wildfly.prospero>
<version.org.wildfly.prospero>1.3.0.Final</version.org.wildfly.prospero>
<!-- maven dependencies -->
<version.javax.inject.javax.inject>1</version.javax.inject.javax.inject>
<version.org.apache.maven.maven-core>3.9.4</version.org.apache.maven.maven-core>