Skip to content

Commit

Permalink
Revert "fix: Push orca which publishes the artifats to armory artifac…
Browse files Browse the repository at this point in the history
…tory"

This reverts commit 8080888.
  • Loading branch information
christosarvanitis committed Sep 19, 2024
1 parent 87f4707 commit fd78fb5
Show file tree
Hide file tree
Showing 5 changed files with 257 additions and 238 deletions.
33 changes: 2 additions & 31 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

plugins {
id "com.jfrog.artifactory" version "5.+"
id 'io.spinnaker.project' version "$spinnakerGradleVersion" apply false
id "org.jetbrains.kotlin.jvm" version "$kotlinVersion" apply false
id "org.jetbrains.kotlin.plugin.allopen" version "$kotlinVersion" apply false
Expand All @@ -25,7 +24,7 @@ plugins {

allprojects {
apply plugin: 'io.spinnaker.project'
apply plugin: 'com.jfrog.artifactory'

group = "io.spinnaker.orca"

tasks.withType(JavaExec) {
Expand All @@ -34,37 +33,9 @@ allprojects {
}
}
}
artifactory {
contextUrl = "https://armory.jfrog.io/armory"
//The base Artifactory URL if not overridden by the publisher/resolver
publish {
repository {
repoKey = "armory-gradle-local"
username = "${artifactory_user}"
password = "${artifactory_password}"
}
defaults {
publications('ALL_PUBLICATIONS')
publishPom = true // Publish generated POM files to Artifactory (true by default)
}

}

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

}
artifactoryPublish.skip=true
subprojects {
apply plugin: 'maven-publish'
repositories {
maven {
url 'https://armory.jfrog.io/armory/armory-gradle-local'
credentials {
username = "${artifactory_user}"
password = "${artifactory_password}"
}
}
}

if ([korkVersion, fiatVersion].any { it.endsWith("-SNAPSHOT") }) {
logger.info("Enabling mavenLocal")
repositories {
Expand Down
6 changes: 2 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
fiatVersion=2.32.1
korkVersion=2.32.1
fiatVersion=1.42.0
korkVersion=7.188.0
kotlinVersion=1.4.32
org.gradle.parallel=true
spinnakerGradleVersion=8.31.0
Expand All @@ -19,5 +19,3 @@ targetJava11=true
#
#fiatComposite=true
#korkComposite=true
group=io.spinnaker.orca
org.gradle.jvmargs=-Xmx4096m
Loading

0 comments on commit fd78fb5

Please sign in to comment.