Skip to content

Commit 86c7347

Browse files
committed
Apply Artifactory Gradle plugin
Instead of relying on the CI server to apply and configure this plugin, this commit does it directly in the Spring Framework build. This allows us to take full control over which projects are published and how. See gh-23282
1 parent 7902ae4 commit 86c7347

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

Diff for: build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ plugins {
1414
id 'org.asciidoctor.convert' version '1.5.8'
1515
id 'io.spring.nohttp' version '0.0.3.RELEASE'
1616
id 'de.undercouch.download' version '4.0.0'
17+
id "com.jfrog.artifactory" version '4.9.8' apply false
1718
}
1819

1920
ext {

Diff for: gradle/publications.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: "maven-publish"
2+
apply plugin: 'com.jfrog.artifactory'
23

34
publishing {
45
publications {
@@ -37,4 +38,8 @@ publishing {
3738
}
3839
}
3940
}
41+
}
42+
43+
artifactoryPublish {
44+
publications(publishing.publications.mavenJava)
4045
}

Diff for: gradle/spring-module.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,3 @@ publishing {
5656
}
5757
}
5858
}
59-
60-

Diff for: integration-tests/integration-tests.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,3 @@ dependencies {
2020
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
2121
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
2222
}
23-
24-
// Avoid publishing JAR to the artifact repository
25-
if (pluginManager.hasPlugin("com.jfrog.artifactory")) {
26-
artifactoryPublish.skip = true
27-
}

Diff for: spring-core/kotlin-coroutines/kotlin-coroutines.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ dependencies {
1010
compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
1111
}
1212

13-
// Avoid publishing JAR to the artifact repository
14-
if (pluginManager.hasPlugin("com.jfrog.artifactory")) {
15-
artifactoryPublish.skip = true
16-
}
17-
1813
eclipse {
1914
project {
2015
buildCommand "org.jetbrains.kotlin.ui.kotlinBuilder"

0 commit comments

Comments
 (0)