# HG changeset patch # User Marc Davis # Date 1693937042 14400 # Node ID b2b512824e8fd59c7bde03a5e1e81da3891955fc # Parent 23617a92ae36c22a1f5b6ebc71a9c0a7a0a3683d revert changes diff -r 23617a92ae36 -r b2b512824e8f artifactory70-github.gradle --- a/artifactory70-github.gradle Tue Sep 05 13:26:06 2023 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ - -logger.info("applying SSDT bamboo/artifactory Gradle Settings") - -buildscript { - repositories { -// maven { url 'https://docker.ssdt.io/artifactory/gradle-plugins' } - mavenCentral() - } - dependencies { - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.28.4" - } -} - -//apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryConfigurationsPlugin - -allprojects { - apply plugin: org.jfrog.gradle.plugin.artifactory.ArtifactoryPlugin - apply plugin: 'ivy-publish' - apply plugin: 'maven-publish' - apply plugin: 'java' - - afterEvaluate { - publishing { - publications { - ivyJava(IvyPublication) { - from components.java - } - - if (gradle.branchStream == 'feature') { - mavenJava(MavenPublication) { - from components.java - group = "${project.gradle.branchHash}/${project.getGroup()}" - } - } else { - mavenJava(MavenPublication) { - from components.java - } - } - } - } - } -} - -artifactory { - contextUrl = 'https://docker.ssdt.io/artifactory' - publish { - def isFeature = gradle.branchStream == 'feature' - repository { - repoKey = isFeature ? 'libs-branches-local' : 'libs-snapshots-local' - if (gradle.branch.isRelease()) { - repoKey = 'libs-releases-local' - } - // Publisher username and password - // Sub projects must provide these values via command line or properties file - username = artifactoryUsername - password = artifactoryPassword - if (isFeature) { - ivy { - ivyLayout = "${project.gradle.branchHash}/[organization]/[module]/ivy-[revision].xml" - artifactLayout = "${project.gradle.branchHash}/[organization]/[module]/[revision]/[module]-[revision](-[classifier]).[ext]" - mavenCompatible = false - } - } - } - defaults { - publications('ivyJava', 'mavenJava') - publishBuildInfo = true - publishArtifacts = true - publishPom = true - publishIvy = true - properties = [ 'ssdt-branch.branchName': gradle.branchName.replaceAll('/','-'), 'ssdt-branch.branchStream': gradle.branchStream ] - } - } -} - diff -r 23617a92ae36 -r b2b512824e8f init70-github.gradle --- a/init70-github.gradle Tue Sep 05 13:26:06 2023 -0400 +++ b/init70-github.gradle Tue Sep 05 14:04:02 2023 -0400 @@ -139,7 +139,7 @@ file('build-number.txt').text = "build.number=${gradle.branch.buildNumber ?: -1 }\n" logger.info "applying SSDT artifactory Gradle Settings (bamboo: $gradle.bambooBuild host: $hostname)" - apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/artifactory70-github.gradle") + apply from: resources.text.fromInsecureUri("${gradle.ssdtDevelkitLocation}/artifactory70.gradle") } if (!rootProject.hasProperty('disableMetrics')) {