Skip to content

Commit 32ddd0a

Browse files
committed
- names repostories and moves urls to build file for clarity
1 parent e76c665 commit 32ddd0a

File tree

2 files changed

+20
-27
lines changed

2 files changed

+20
-27
lines changed

build.gradle

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,10 @@ publishing {
7373
publications {
7474

7575
maven(MavenPublication) {
76-
7776
groupId 'com.microsoft.graph'
78-
7977
artifactId 'microsoft-graph'
80-
8178
version "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}${mavenArtifactSuffix}"
82-
8379
from components.java
84-
8580
artifact sourceJar
8681
artifact javadocJar
8782
pom.withXml {
@@ -141,55 +136,57 @@ publishing {
141136
}
142137
repositories {
143138
maven {
144-
url = project.property('mavenCentralSnapshotUrl')
139+
url = 'https://oss.sonatype.org/content/repositories/snapshots'
140+
name = 'sonatypeSnapshot'
145141

146142
credentials {
147143
if (project.rootProject.file('local.properties').exists()) {
148-
149144
Properties properties = new Properties()
150-
151145
properties.load(project.rootProject.file('local.properties').newDataInputStream())
152-
153146
username = properties.getProperty('sonatypeUsername')
154-
155147
password = properties.getProperty('sonatypePassword')
156-
157148
}
158149
}
159150
}
160151

161152
maven {
162-
url = project.property('mavenCentralReleaseUrl')
153+
url = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
154+
name = 'sonatype'
163155

164156
credentials {
165157
if (project.rootProject.file('local.properties').exists()) {
166-
167158
Properties properties = new Properties()
168-
169159
properties.load(project.rootProject.file('local.properties').newDataInputStream())
170-
171160
username = properties.getProperty('sonatypeUsername')
172-
173161
password = properties.getProperty('sonatypePassword')
174-
175162
}
176163
}
177164
}
178165

179166
maven {
180-
url = project.property('mavenBintraySnapshotUrl')
167+
url = 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
168+
name = 'jfrogSnapshot'
181169

182170
credentials {
183171
if (project.rootProject.file('local.properties').exists()) {
184-
185172
Properties properties = new Properties()
186-
187173
properties.load(project.rootProject.file('local.properties').newDataInputStream())
188-
189174
username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
190-
191175
password = properties.getProperty('bintray.apikey')
176+
}
177+
}
178+
}
192179

180+
maven {
181+
url = 'https://oss.jfrog.org/artifactory/libs-release'
182+
name = 'jfrog'
183+
184+
credentials {
185+
if (project.rootProject.file('local.properties').exists()) {
186+
Properties properties = new Properties()
187+
properties.load(project.rootProject.file('local.properties').newDataInputStream())
188+
username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
189+
password = properties.getProperty('bintray.apikey')
193190
}
194191
}
195192
}
@@ -277,7 +274,7 @@ model {
277274
tasks.publishMavenCentralReleasePublicationToMavenLocal {
278275
dependsOn project.tasks.signArchives
279276
}
280-
tasks.publishMavenCentralReleasePublicationToMaven2Repository {
277+
tasks.publishMavenCentralReleasePublicationToSonatypeRepository {
281278
dependsOn project.tasks.signArchives
282279
}
283280
}

gradle.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
## linux requires 10G, OSX requires 11G
2222
org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g
2323

24-
mavenRepoUrl = https://api.bintray.com/content/microsoftgraph/Maven/microsoft-graph
25-
mavenBintraySnapshotUrl = http://oss.jfrog.org/artifactory/oss-snapshot-local
2624
mavenGroupId = com.microsoft.graph
2725
mavenArtifactId = microsoft-graph
2826
mavenMajorVersion = 2
@@ -40,7 +38,5 @@ Username="USERNAME"
4038
Password="PASSWORD"
4139

4240
#enable mavenCentralPublishingEnabled to publish to maven central
43-
mavenCentralSnapshotUrl=https://oss.sonatype.org/content/repositories/snapshots
44-
mavenCentralReleaseUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2
4541
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
4642
mavenCentralPublishingEnabled=false

0 commit comments

Comments
 (0)