Browse Source

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
pull/23506/head
Brian Clozel 6 years ago
parent
commit
86c734785d
  1. 1
      build.gradle
  2. 5
      gradle/publications.gradle
  3. 2
      gradle/spring-module.gradle
  4. 5
      integration-tests/integration-tests.gradle
  5. 5
      spring-core/kotlin-coroutines/kotlin-coroutines.gradle

1
build.gradle

@ -14,6 +14,7 @@ plugins { @@ -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 {

5
gradle/publications.gradle

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
apply plugin: "maven-publish"
apply plugin: 'com.jfrog.artifactory'
publishing {
publications {
@ -37,4 +38,8 @@ publishing { @@ -37,4 +38,8 @@ publishing {
}
}
}
}
artifactoryPublish {
publications(publishing.publications.mavenJava)
}

2
gradle/spring-module.gradle

@ -56,5 +56,3 @@ publishing { @@ -56,5 +56,3 @@ publishing {
}
}
}

5
integration-tests/integration-tests.gradle

@ -20,8 +20,3 @@ dependencies { @@ -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
spring-core/kotlin-coroutines/kotlin-coroutines.gradle

@ -10,11 +10,6 @@ dependencies { @@ -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"

Loading…
Cancel
Save