Skip to content

Commit b5bd621

Browse files
committed
Support consistent build info
Closes gh-14538
1 parent 4e5780a commit b5bd621

File tree

1 file changed

+56
-0
lines changed

1 file changed

+56
-0
lines changed

buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@ class ArtifactoryPlugin implements Plugin<Project> {
2929

3030
private static final String ARTIFACTORY_RELEASE_REPOSITORY = "ARTIFACTORY_RELEASE_REPOSITORY"
3131

32+
private static final String ARTIFACTORY_PROJECT_KEY = "ARTIFACTORY_PROJECT_KEY"
33+
34+
private static final String ARTIFACTORY_BUILD_NAME = "ARTIFACTORY_BUILD_NAME"
35+
36+
private static final String ARTIFACTORY_BUILD_NUMBER = "ARTIFACTORY_BUILD_NUMBER"
37+
38+
private static final String ARTIFACTORY_BUILD_URL = "ARTIFACTORY_BUILD_URL"
39+
40+
private static final String ARTIFACTORY_BUILD_AGENT_NAME = "ARTIFACTORY_BUILD_AGENT_NAME"
41+
42+
private static final String ARTIFACTORY_BUILD_AGENT_VERSION = "ARTIFACTORY_BUILD_AGENT_VERSION"
43+
44+
private static final String ARTIFACTORY_USER_AGENT_NAME = "ARTIFACTORY_USER_AGENT_NAME"
45+
46+
private static final String ARTIFACTORY_USER_AGENT_VERSION = "ARTIFACTORY_USER_AGENT_VERSION"
47+
48+
private static final String ARTIFACTORY_VCS_REVISION = "ARTIFACTORY_VCS_REVISION"
49+
3250
private static final String DEFAULT_ARTIFACTORY_URL = "https://repo.spring.io"
3351

3452
private static final String DEFAULT_ARTIFACTORY_SNAPSHOT_REPOSITORY = "libs-snapshot-local"
@@ -48,6 +66,15 @@ class ArtifactoryPlugin implements Plugin<Project> {
4866
String snapshotRepository = env.getOrDefault(ARTIFACTORY_SNAPSHOT_REPOSITORY, DEFAULT_ARTIFACTORY_SNAPSHOT_REPOSITORY)
4967
String milestoneRepository = env.getOrDefault(ARTIFACTORY_MILESTONE_REPOSITORY, DEFAULT_ARTIFACTORY_MILESTONE_REPOSITORY)
5068
String releaseRepository = env.getOrDefault(ARTIFACTORY_RELEASE_REPOSITORY, DEFAULT_ARTIFACTORY_RELEASE_REPOSITORY)
69+
String projectKey = env.get(ARTIFACTORY_PROJECT_KEY)
70+
String buildName = env.get(ARTIFACTORY_BUILD_NAME)
71+
String buildNumber = env.get(ARTIFACTORY_BUILD_NUMBER)
72+
String buildUrl = env.get(ARTIFACTORY_BUILD_URL)
73+
String buildAgentName = env.get(ARTIFACTORY_BUILD_AGENT_NAME)
74+
String buildAgentVersion = env.get(ARTIFACTORY_BUILD_AGENT_VERSION)
75+
String userAgentName = env.get(ARTIFACTORY_USER_AGENT_NAME)
76+
String userAgentVersion = env.get(ARTIFACTORY_USER_AGENT_VERSION)
77+
String vcsRevision = env.get(ARTIFACTORY_VCS_REVISION)
5178
project.artifactory {
5279
contextUrl = artifactoryUrl
5380
publish {
@@ -59,6 +86,35 @@ class ArtifactoryPlugin implements Plugin<Project> {
5986
}
6087
}
6188
}
89+
90+
def buildInfo = clientConfig.info
91+
if (projectKey != null) {
92+
buildInfo.setProject(projectKey)
93+
}
94+
if (buildName != null) {
95+
buildInfo.setBuildName(buildName)
96+
}
97+
if (buildNumber != null) {
98+
buildInfo.setBuildNumber(buildNumber)
99+
}
100+
if (buildUrl != null) {
101+
buildInfo.setBuildUrl(buildUrl)
102+
}
103+
if (buildAgentName != null) {
104+
buildInfo.setBuildAgentName(buildAgentName)
105+
}
106+
if (buildAgentVersion != null) {
107+
buildInfo.setBuildAgentVersion(buildAgentVersion)
108+
}
109+
if (userAgentName != null) {
110+
buildInfo.setAgentName(userAgentName)
111+
}
112+
if (userAgentVersion != null) {
113+
buildInfo.setAgentVersion(userAgentVersion)
114+
}
115+
if (vcsRevision != null) {
116+
buildInfo.setVcsRevision(vcsRevision)
117+
}
62118
}
63119
project.plugins.withType(MavenPublishPlugin) {
64120
project.artifactory {

0 commit comments

Comments
 (0)