Skip to content

Commit 7080db5

Browse files
authored
Merge pull request #142 from microsoftgraph/feature/bintray-removal
- removes bintray/jcenter from repo in preparation for sunset
2 parents 92d661e + e7d7b24 commit 7080db5

File tree

5 files changed

+1
-67
lines changed

5 files changed

+1
-67
lines changed

android/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ buildscript {
1111
classpath "com.gradle:gradle-enterprise-gradle-plugin:3.5"
1212
classpath "com.android.tools.build:gradle:4.0.1"
1313
classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
14-
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
1514
}
1615
}
1716

android/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ mavenMajorVersion = 2
2929
mavenMinorVersion = 3
3030
mavenPatchVersion = 1
3131
mavenArtifactSuffix =
32-
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
3332

3433
#These values are used to run functional tests
3534
#If you wish to run the functional tests, edit the gradle.properties

build.gradle

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ plugins {
1313
id 'eclipse'
1414
id 'maven-publish'
1515
id 'signing'
16-
id 'com.jfrog.bintray' version '1.8.5'
1716
id 'jacoco'
1817
}
1918

@@ -49,9 +48,7 @@ sourceSets {
4948

5049
// In this section you declare where to find the dependencies of your project
5150
repositories {
52-
// Use jcenter for resolving your dependencies.
5351
// You can declare any Maven/Ivy/file repository here.
54-
jcenter()
5552
mavenCentral()
5653
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // for jacoco, until 0.8.7 gets released
5754
}
@@ -166,34 +163,6 @@ publishing {
166163
}
167164
}
168165
}
169-
170-
maven {
171-
url = 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
172-
name = 'jfrogSnapshot'
173-
174-
credentials {
175-
if (project.rootProject.file('local.properties').exists()) {
176-
Properties properties = new Properties()
177-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
178-
username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
179-
password = properties.getProperty('bintray.apikey')
180-
}
181-
}
182-
}
183-
184-
maven {
185-
url = 'https://oss.jfrog.org/artifactory/libs-release'
186-
name = 'jfrog'
187-
188-
credentials {
189-
if (project.rootProject.file('local.properties').exists()) {
190-
Properties properties = new Properties()
191-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
192-
username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
193-
password = properties.getProperty('bintray.apikey')
194-
}
195-
}
196-
}
197166
}
198167
}
199168

@@ -209,38 +178,6 @@ def fixAscNames = { name ->
209178
name.replace('msgraph-sdk-java-core', "${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}")
210179
}
211180
}
212-
bintray {
213-
if (project.rootProject.file('local.properties').exists()) {
214-
Properties properties = new Properties()
215-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
216-
user = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
217-
key = properties.getProperty('bintray.apikey')
218-
}
219-
publications = ['mavenCentralRelease']
220-
filesSpec {
221-
from ('build/libs') {
222-
include 'msgraph-sdk-java-core*.jar.asc'
223-
rename fixAscNames
224-
}
225-
from ('build') {
226-
include 'generated-pom.xml.asc'
227-
rename fixAscNames
228-
}
229-
into "com/microsoft/graph/${project.property('mavenArtifactId')}/${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}/"
230-
}
231-
pkg {
232-
repo = 'Maven'
233-
name = project.property('mavenArtifactId')
234-
userOrg = 'microsoftgraph'
235-
licenses = ['MIT']
236-
vcsUrl = 'https://github.com/microsoftgraph/msgraph-sdk-java-core.git'
237-
publicDownloadNumbers = true
238-
version {
239-
name = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
240-
vcsTag = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
241-
}
242-
}
243-
}
244181

245182
compileJava {
246183
sourceCompatibility = 1.8

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ mavenMajorVersion = 2
2727
mavenMinorVersion = 0
2828
mavenPatchVersion = 0
2929
mavenArtifactSuffix =
30-
nightliesUrl = http://dl.bintray.com/MicrosoftGraph/Maven
3130

3231
#These values are used to run functional tests
3332
#If you wish to run the functional tests, edit the gradle.properties

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Add the repository and a compile dependency for `microsoft-graph-core` to your p
1515

1616
```gradle
1717
repositories {
18-
jcenter()
18+
mavenCentral()
1919
}
2020
2121
dependencies {

0 commit comments

Comments
 (0)