Skip to content

Commit

Permalink
Apply Artifactory Gradle plugin
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bclozel committed Aug 21, 2019
1 parent 7902ae4 commit 86c7347
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 12 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ plugins {
id 'org.asciidoctor.convert' version '1.5.8'
id 'io.spring.nohttp' version '0.0.3.RELEASE'
id 'de.undercouch.download' version '4.0.0'
id "com.jfrog.artifactory" version '4.9.8' apply false
}

ext {
Expand Down
5 changes: 5 additions & 0 deletions gradle/publications.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: "maven-publish"
apply plugin: 'com.jfrog.artifactory'

publishing {
publications {
Expand Down Expand Up @@ -37,4 +38,8 @@ publishing {
}
}
}
}

artifactoryPublish {
publications(publishing.publications.mavenJava)
}
2 changes: 0 additions & 2 deletions gradle/spring-module.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,3 @@ publishing {
}
}
}


5 changes: 0 additions & 5 deletions integration-tests/integration-tests.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,3 @@ dependencies {
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile("org.hibernate:hibernate-core:5.1.17.Final")
}

// Avoid publishing JAR to the artifact repository
if (pluginManager.hasPlugin("com.jfrog.artifactory")) {
artifactoryPublish.skip = true
}
5 changes: 0 additions & 5 deletions spring-core/kotlin-coroutines/kotlin-coroutines.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ dependencies {
compile("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
}

// Avoid publishing JAR to the artifact repository
if (pluginManager.hasPlugin("com.jfrog.artifactory")) {
artifactoryPublish.skip = true
}

eclipse {
project {
buildCommand "org.jetbrains.kotlin.ui.kotlinBuilder"
Expand Down

0 comments on commit 86c7347

Please sign in to comment.