summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Edin <henrik.edin@mongodb.com>2018-10-30 16:58:09 -0400
committerHenrik Edin <henrik.edin@mongodb.com>2018-10-30 17:11:47 -0400
commit005d54fff1b4eaaf2850747071203045b76d8402 (patch)
tree35b4808452d0b752ad7adc952b9c5c12fdbba684
parent0b0aac7a44bc7f83176aa694b11e1c19e9794657 (diff)
downloadmongo-r4.0.4-rc0.tar.gz
SERVER-37813 Switch out Bintray for Artifactoryr4.0.4-rc0
(cherry picked from commit 859e4b4a2fc02c67fafd084ed60fa1064df3b060)
-rw-r--r--src/mongo/embedded/mongo_embedded/java/aar/build.gradle44
-rw-r--r--src/mongo/embedded/mongo_embedded/java/build.gradle2
-rw-r--r--src/mongo/embedded/mongo_embedded/java/jar/build.gradle42
3 files changed, 41 insertions, 47 deletions
diff --git a/src/mongo/embedded/mongo_embedded/java/aar/build.gradle b/src/mongo/embedded/mongo_embedded/java/aar/build.gradle
index 9fca4b80956..a1e72615d6a 100644
--- a/src/mongo/embedded/mongo_embedded/java/aar/build.gradle
+++ b/src/mongo/embedded/mongo_embedded/java/aar/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
apply plugin: 'digital.wup.android-maven-publish'
apply plugin: 'optional-base'
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.jfrog.artifactory'
android {
compileSdkVersion 28
@@ -71,29 +71,25 @@ publishing {
}
}
-bintray {
- dryRun = true
- //publish = false
-
- user = System.getenv('BINTRAY_USER')
- key = System.getenv('BINTRAY_KEY')
-
- publications = ['mavenAar']
-
- pkg {
- repo = 'MongoDB'
- name = "$group:$libraryName-android"
- userOrg = 'mongodb'
- licenses = [licenseShort]
- vcsUrl = pomScmConnection
- githubRepo = 'mongodb/mongo'
- githubReleaseNotesFile = 'README'
- websiteUrl = pomUrl
- publicDownloadNumbers = true
-
- version {
- name = getGitVersion()
+artifactory {
+ contextUrl = "http://artifactory.corp.mongodb.com/artifactory"
+ publish {
+ repository {
+ repoKey = 'mongodb-mobile-local'
+ username = System.getenv('artifactory_mobile_user')
+ password = System.getenv('artifactory_mobile_pass')
+ maven = true
+ }
+ defaults {
+ publications ('mavenAar')
+ }
+ }
+ resolve {
+ repository {
+ repoKey = 'maven'
+ username = System.getenv('artifactory_mobile_user')
+ password = System.getenv('artifactory_mobile_pass')
+ maven = true
}
}
}
-
diff --git a/src/mongo/embedded/mongo_embedded/java/build.gradle b/src/mongo/embedded/mongo_embedded/java/build.gradle
index eef846ea0a6..0296cb58b6a 100644
--- a/src/mongo/embedded/mongo_embedded/java/build.gradle
+++ b/src/mongo/embedded/mongo_embedded/java/build.gradle
@@ -20,7 +20,7 @@ buildscript {
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+'
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'digital.wup:android-maven-publish:3.6.2'
- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.+'
+ classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:latest.release'
}
}
diff --git a/src/mongo/embedded/mongo_embedded/java/jar/build.gradle b/src/mongo/embedded/mongo_embedded/java/jar/build.gradle
index ce6995bea2d..566770c793f 100644
--- a/src/mongo/embedded/mongo_embedded/java/jar/build.gradle
+++ b/src/mongo/embedded/mongo_embedded/java/jar/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java-library'
apply plugin: 'osgi'
apply plugin: 'maven-publish'
apply plugin: 'optional-base'
-apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.jfrog.artifactory'
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
@@ -74,28 +74,26 @@ publishing {
}
}
-bintray {
- dryRun = true
- //publish = false
- user = System.getenv('BINTRAY_USER')
- key = System.getenv('BINTRAY_KEY')
-
- publications = ['maven']
-
- pkg {
- repo = 'MongoDB'
- name = "$group:$libraryName"
- userOrg = 'mongodb'
- licenses = [licenseShort]
- vcsUrl = pomScmConnection
- githubRepo = 'mongodb/mongo'
- githubReleaseNotesFile = 'README'
- websiteUrl = pomUrl
- publicDownloadNumbers = true
-
- version {
- name = getGitVersion()
+artifactory {
+ contextUrl = "http://artifactory.corp.mongodb.com/artifactory"
+ publish {
+ repository {
+ repoKey = 'mongodb-mobile-local'
+ username = System.getenv('artifactory_mobile_user')
+ password = System.getenv('artifactory_mobile_pass')
+ maven = true
+ }
+ defaults {
+ publications ('maven')
+ }
+ }
+ resolve {
+ repository {
+ repoKey = 'maven'
+ username = System.getenv('artifactory_mobile_user')
+ password = System.getenv('artifactory_mobile_pass')
+ maven = true
}
}
}