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

Fix for ci failure #156

Merged
merged 1 commit into from
Feb 27, 2024
Merged

Fix for ci failure #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...dles/kpm/src/main/java/org/killbill/billing/osgi/bundles/kpm/impl/UrlResolverFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public UrlResolverFactory(final KpmProperties kpmProperties) {
// add something like "/content/repositories" at this point.
private String getValidUrlIfSonatype(final String url) {
return url.contains("oss.sonatype.org") ?
String.format("%s/content/repositories/%s", kpmProperties.getNexusUrl(), kpmProperties.getNexusRepository()) :
String.format("%scontent/repositories/%s", kpmProperties.getNexusUrl(), kpmProperties.getNexusRepository()) :
url;
}

Expand All @@ -56,7 +56,7 @@ public UriResolver getVersionsProviderUrlResolver() {
final AuthenticationMethod authMethod = AuthenticationMethod.valueOf(kpmProperties.getNexusAuthMethod().toUpperCase());
switch (authMethod) {
case NONE:
String baseUrl = getValidUrlIfSonatype(kpmProperties.getNexusUrl() + "/" + kpmProperties.getNexusRepository());
String baseUrl = getValidUrlIfSonatype(kpmProperties.getNexusUrl() + kpmProperties.getNexusRepository());
return new NoneUriResolver(baseUrl);

case BASIC:
Expand Down
4 changes: 2 additions & 2 deletions ...pm/src/test/java/org/killbill/billing/osgi/bundles/kpm/impl/TestDefaultPluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public void beforeMethod() {
@Test(groups = "slow")
public void testGetAvailablePlugins() {
// Get plugin info from actual, default, killbill plugins_directory.yml. See DefaultPluginsDirectoryDAO
GetAvailablePluginsModel result = pluginManager.getAvailablePlugins("0.18.0", true);
Assert.assertEquals(result.getKillbillArtifactsVersion().getKillbill(), "0.18.0");
GetAvailablePluginsModel result = pluginManager.getAvailablePlugins("0.24.0", true);
Assert.assertEquals(result.getKillbillArtifactsVersion().getKillbill(), "0.24.0");
Assert.assertFalse(result.getAvailablePlugins().isEmpty());

try {
Expand Down
Loading