Skip to content

Commit

Permalink
Merge pull request #7 from link-intersystems/bugfix/default-repositor…
Browse files Browse the repository at this point in the history
…ies-not-used

Publication repositories should be used if none are provided.
  • Loading branch information
renelink committed Sep 4, 2024
2 parents 187cca9 + dc702c9 commit 865c3b1
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public List<ArtifactPublication> getArtifactPublications(Project project) {
}).collect(Collectors.toList());
}

MavenVerifyRepositoryHandler verifyRepositories = getVerifyRepositories();
List<MavenArtifactRepository> artifactRepositories = verifyRepositories.getArtifactRepositories();
List<MavenArtifactRepository> artifactRepositories = getRepositories(project);
return artifactRepositories.stream().map(repo -> MavenArtifactPublication.of((MavenPublicationInternal) getPublication(project), repo, getEffectiveVersionProvider())).collect(Collectors.toList());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import com.link_intersystems.gradle.junit.GradleIntegrationTest;
import com.link_intersystems.gradle.project.builder.FileBuilder;
import com.link_intersystems.gradle.project.builder.GradleProjectBuilder;
import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.GradleRunner;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -41,6 +43,18 @@ void verifyNoneExistsFailed() throws IOException {
gradleRunner.withArguments(":verifyMavenPublicationToTempLocalRepository").buildAndFail();
}

@Test
void verifyDefaultRepositories() throws IOException {
FileBuilder rootBuildScript = rootProjectBuilder.buildFile();
rootProjectBuilder.settingsFile().append("rootProject.name = \"test-artifact\"");
fromResource(rootBuildScript, "verifyDefaultRepositories.build.gradle.kts");
FileBuilder pomContent = rootProjectBuilder.file(".m2/repository/com/link-intersystems/test/test-artifact/1.2.3/test-artifact-1.2.3.pom");
pomContent.append("");

BuildResult buildResult = gradleRunner.withArguments(":verifyMavenPublicationToTempLocalRepository").build();
Assertions.assertEquals(1, buildResult.getTasks().size());
}

private void fromResource(FileBuilder fileBuilder, String resource) {
fileBuilder.append(Objects.requireNonNull(getClass().getResource(getClass().getSimpleName() + "_" + resource)));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import com.link_intersystems.gradle.publication.VersionProvider
import com.link_intersystems.gradle.publication.plugins.verify.VerifyPublicationResultHandlers
import com.link_intersystems.gradle.publication.plugins.verify.maven.VerifyMavenPublication

plugins {
id("java-library")
id("maven-publish")
id("com.link-intersystems.gradle.publication-utils")
}

group = "com.link-intersystems.gradle.publication.test"
version = "1.0.0-SNAPSHOT"

publishing {
publications {
create<MavenPublication>("maven") {
from(components["java"])
}
}

repositories {
maven {
name = "TempLocal"
url = uri(layout.projectDirectory.dir(".m2/repository"))
}
}
}

publications {
verify {
create<VerifyMavenPublication>("maven") {
resultHandler = VerifyPublicationResultHandlers.NONE_EXISTS
}
}
}

0 comments on commit 865c3b1

Please sign in to comment.