Skip to content

Commit

Permalink
fix: Update artifctory publish
Browse files Browse the repository at this point in the history
  • Loading branch information
ovidiupopa07 committed Mar 7, 2024
1 parent 6bff4a2 commit 10b77ec
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 56 deletions.
28 changes: 8 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

plugins {
id 'nebula.maven-publish' version '8.1.0'
id "com.jfrog.artifactory" version "4.13.0"
id 'nebula.release' version '15.0.2'
// id 'nebula.maven-publish' version '8.1.0'
id "com.jfrog.artifactory" version "5.+"
// id 'nebula.release' version '15.0.2'
id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false
id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
id "io.gitlab.arturbosch.detekt" version "1.17.1" apply false
Expand All @@ -37,37 +37,27 @@ artifactory {
repoKey = "armory-gradle-local"
username = "${artifactory_user}"
password = "${artifactory_password}"
maven = true
}
defaults {
publications('nebula', 'defaultSettingsPluginMarkerMaven', 'pluginsDownloaderPluginMarkerMaven')
publications('ALL_PUBLICATIONS')
publishPom = true // Publish generated POM files to Artifactory (true by default)
}
}
resolve {
repository {
repoKey = "gradle-release"
username = "${artifactory_user}"
password = "${artifactory_password}"
maven = true

}
}

clientConfig.info.setBuildNumber(getProperties().get("JFROG_CLI_BUILD_NUMBER", project.getVersion()).toString())

}
artifactoryPublish.skip=true
subprojects {
apply plugin: 'nebula.maven-publish'
apply plugin: 'maven-publish'
afterEvaluate {
if (it.name != "kork-bom" && it.name != "spinnaker-dependencies") {
dependencies {
annotationProcessor(platform(project(":spinnaker-dependencies")))
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
}
artifactoryPublish {
publications("nebula")
}
}
}
if (it.name != "kork-bom" && it.name != "spinnaker-dependencies") {
Expand All @@ -82,9 +72,7 @@ subprojects {
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
}
artifactoryPublish {
publications("nebula")
}

}
}
task printVersion {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 0 additions & 19 deletions kork-bom/kork-bom.gradle
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
apply plugin: "java-platform"
apply plugin: "nebula.maven-publish"

javaPlatform {
allowDependencies()
}
// without this building the pom fails when using the Nebula publishing plugin
configurations {
implementation
}
artifactoryPublish.skip = false
// This is a BOM - aka there is actually no CODE - it's PURE BOM
publishing {
publications {
nebula(MavenPublication) {
from components.javaPlatform
}
}
}

artifactoryPublish {
skip = false //Skip build info analysis and publishing (false by default)
publications ('nebula')
}

dependencies {
api(platform(project(":spinnaker-dependencies")))
Expand Down
17 changes: 1 addition & 16 deletions spinnaker-dependencies/spinnaker-dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
apply plugin: "java-platform"
apply plugin: "nebula.maven-publish"
javaPlatform {
allowDependencies()
}
// without this building the pom fails when using the Nebula publishing plugin
configurations {
implementation
}

artifactoryPublish.skip = false
// This is a BOM - aka there is actually no CODE - it's PURE BOM
publishing {
publications {
nebula(MavenPublication) {
from components.javaPlatform
}
}
}

artifactoryPublish {
skip = false //Skip build info analysis and publishing (false by default)
publications ('nebula')
}

ext {
versions = [
Expand Down

0 comments on commit 10b77ec

Please sign in to comment.