Skip to content

Commit c57d18e

Browse files
authored
Bugfix - Missing Gradle build-info props on artifacts (#649)
1 parent 1713039 commit c57d18e

File tree

2 files changed

+5
-1
lines changed
  • build-info-extractor-gradle/src
    • main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper
    • test/java/org/jfrog/gradle/plugin/artifactory

2 files changed

+5
-1
lines changed

Diff for: build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/task/helper/TaskHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected Map<String, String> getPropsToAdd(PublishArtifactInfo artifact, String
5656
addProps(defaultProps, artifactoryTask.getProperties());
5757
// Add the publisher properties
5858
ArtifactoryClientConfiguration.PublisherHandler publisher =
59-
ArtifactoryPluginUtil.getPublisherHandler(project);
59+
ArtifactoryPluginUtil.getPublisherHandler(project.getRootProject());
6060
if (publisher != null) {
6161
defaultProps.putAll(publisher.getMatrixParams());
6262
}

Diff for: build-info-extractor-gradle/src/test/java/org/jfrog/gradle/plugin/artifactory/Utils.java

+4
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,10 @@ static void checkBuildResults(ArtifactoryManager artifactoryManager, BuildResult
150150
BuildInfo buildInfo = getBuildInfo(artifactoryManager, buildResult);
151151
assertNotNull(buildInfo);
152152
checkBuildInfoModules(buildInfo, 3, expectModuleArtifacts ? 5 : 4);
153+
154+
// Check build info properties on published Artifacts
155+
PropertySearchResult artifacts = artifactoryManager.searchArtifactsByProperties(String.format("build.name=%s;build.number=%s", buildInfo.getName(), buildInfo.getNumber()));
156+
assertTrue(artifacts.getResults().size() >= 12);
153157
}
154158

155159
static void assertProjectsSuccess(BuildResult buildResult) {

0 commit comments

Comments
 (0)