Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit ba7a197

Browse files
oliemansmoliemansm
committed
ci: remove bintray and artifactory publish
publish snapshot to sonatype repository fixes issue #581
1 parent d025bf0 commit ba7a197

File tree

8 files changed

+83
-81
lines changed

8 files changed

+83
-81
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ jobs:
6363
- name: Make gradlew executable
6464
run: chmod +x ./gradlew
6565
- name: Gradle Publish Snapshot
66-
if: env.BINTRAY_USER != 'SKIP_BINTRAY_PUBLISH' && env.BINTRAY_USER != null
66+
if: env.OSS_USER_TOKEN_KEY != null
6767
env:
68-
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
69-
BINTRAY_PASS: ${{ secrets.BINTRAY_PASSWORD }}
70-
run: ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number=${{ env.GITHUB_RUN_NUMBER }}
68+
OSS_USER_TOKEN_KEY: ${{ secrets.OSS_USER_TOKEN_KEY }}
69+
OSS_USER_TOKEN_PASS: ${{ secrets.OSS_USER_TOKEN_PASS }}
70+
run: ./gradlew publish
7171
sonar:
7272
name: Sonar analysis
7373
needs: validation

‎build.gradle‎

Lines changed: 78 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
2121
import org.gradle.api.tasks.testing.logging.TestLogEvent
2222

2323
plugins {
24-
id "com.jfrog.bintray" version "$LIB_BINTRAY_PLUGIN_VER" apply false
25-
id 'net.researchgate.release' version "$LIB_RELEASE_PLUGIN_VER"
2624
id "org.springframework.boot" version "$LIB_SPRING_BOOT_VER" apply false
27-
id "com.jfrog.artifactory" version "4.21.0" apply false
2825
id "org.sonarqube" version "3.1.1"
2926
id "jacoco"
3027
}
@@ -49,15 +46,14 @@ subprojects {
4946
apply plugin: "io.spring.dependency-management"
5047
}
5148
apply plugin: 'maven-publish'
52-
apply plugin: "com.jfrog.bintray"
49+
apply plugin: 'signing'
5350
apply plugin: 'com.jfrog.artifactory'
5451

5552
group "$PROJECT_GROUP"
5653

5754
repositories {
5855
mavenLocal()
5956
mavenCentral()
60-
maven { url "https://dl.bintray.com/graphql-java-kickstart/releases" }
6157
maven { url "https://repo.spring.io/libs-milestone" }
6258
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
6359
maven { url "https://oss.jfrog.org/artifactory/oss-snapshot-local" }
@@ -138,9 +134,20 @@ subprojects {
138134
}
139135
}
140136

137+
signing {
138+
// useInMemoryPgpKeys(System.env.GPG_SIGNING_KEY, System.env.GPG_SIGNING_PASSWORD)
139+
required {
140+
// signing is required if this is a release version and the artifacts are to be published
141+
!version.toString().endsWith('-SNAPSHOT') && tasks.withType(PublishToMavenRepository).find {
142+
gradle.taskGraph.hasTask it
143+
}
144+
}
145+
sign publishing.publications
146+
}
147+
141148
publishing {
142149
publications {
143-
mainProjectPublication(MavenPublication) {
150+
mavenJava(MavenPublication) {
144151
if (project.name != bomProjectName) {
145152
from components.java
146153
}
@@ -179,85 +186,86 @@ subprojects {
179186
}
180187
}
181188
}
189+
190+
// // create the sign pom artifact
191+
// pom.withXml {
192+
// def pomFile = file("${project.buildDir}/generated-pom.xml")
193+
// writeTo(pomFile)
194+
// def pomAscFile = signing.sign(pomFile).signatureFiles[0]
195+
// artifact(pomAscFile) {
196+
// classifier = null
197+
// extension = 'pom.asc'
198+
// }
199+
// }
200+
// // create the signed artifacts
201+
// project.tasks.signArchives.signatureFiles.each {
202+
// artifact(it) {
203+
// def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
204+
// if (matcher.find()) {
205+
// classifier = matcher.group(1)
206+
// } else {
207+
// classifier = null
208+
// }
209+
// extension = 'jar.asc'
210+
// }
211+
// }
182212
}
183213
}
184-
}
185-
186-
bintray {
187-
user = System.env.BINTRAY_USER ?: project.findProperty('BINTRAY_USER') ?: ''
188-
key = System.env.BINTRAY_PASS ?: project.findProperty('BINTRAY_PASS') ?: ''
189-
publications = ['mainProjectPublication']
190-
publish = true
191-
pkg {
192-
repo = 'releases'
193-
name = PROJECT_NAME
194-
desc = PROJECT_DESC
195-
licenses = [PROJECT_LICENSE]
196-
vcsUrl = PROJECT_GIT_REPO_URL
197-
userOrg = 'graphql-java-kickstart'
198-
version {
199-
name = project.version
200-
gpg {
201-
sign = true
214+
repositories {
215+
maven {
216+
name 'ossrh'
217+
if (version.toString().endsWith("-SNAPSHOT")) {
218+
url "https://oss.sonatype.org/content/repositories/snapshots/"
219+
} else {
220+
url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
202221
}
203-
mavenCentralSync {
204-
user = System.env.OSS_USER_TOKEN_KEY ?: project.findProperty('OSS_USER_TOKEN_KEY') ?: ''
222+
credentials {
223+
username = System.env.OSS_USER_TOKEN_KEY ?: project.findProperty('OSS_USER_TOKEN_KEY') ?: ''
205224
password = System.env.OSS_USER_TOKEN_PASS ?: project.findProperty('OSS_USER_TOKEN_PASS') ?: ''
206225
}
207226
}
208227
}
209228
}
210229

211-
artifactory {
212-
contextUrl = 'https://oss.jfrog.org'
213-
publish {
214-
repository {
215-
if (project.version.endsWith("-SNAPSHOT")) {
216-
repoKey = 'oss-snapshot-local'
217-
} else {
218-
repoKey = 'oss-release-local'
219-
}
220-
username = System.env.BINTRAY_USER ?: project.findProperty('BINTRAY_USER') ?: ''
221-
password = System.env.BINTRAY_PASS ?: project.findProperty('BINTRAY_PASS') ?: ''
222-
}
223-
defaults {
224-
publications('mainProjectPublication')
225-
publishArtifacts = true
226-
publishPom = true
227-
}
228-
}
229-
resolve {
230-
repoKey = 'oss-snapshot-local'
231-
}
232-
clientConfig.info.setBuildNumber(System.getProperty('build.number'))
233-
}
234-
}
235-
}
230+
// model {
231+
// tasks.publishMavenJavaPublicationToMavenLocal {
232+
// dependsOn project.tasks.signArchives
233+
// }
234+
// tasks.publishMavenJavaPublicationToMavenRepository {
235+
// dependsOn project.tasks.signArchives
236+
// }
237+
// }
236238

237-
release {
238-
tagTemplate = 'v${version}'
239-
failOnPublishNeeded = false
240-
ignoredSnapshotDependencies = [
241-
'com.graphql-java-kickstart:altair-spring-boot-autoconfigure',
242-
'com.graphql-java-kickstart:altair-spring-boot-starter',
243-
'com.graphql-java-kickstart:graphiql-spring-boot-autoconfigure',
244-
'com.graphql-java-kickstart:graphiql-spring-boot-starter',
245-
'com.graphql-java-kickstart:graphql-spring-boot-autoconfigure',
246-
'com.graphql-java-kickstart:graphql-spring-boot-starter',
247-
'com.graphql-java-kickstart:graphql-spring-boot-starter-test',
248-
'com.graphql-java-kickstart:graphql-spring-boot-test',
249-
'com.graphql-java-kickstart:graphql-spring-boot-test-autoconfigure',
250-
'com.graphql-java-kickstart:voyager-spring-boot-autoconfigure',
251-
'com.graphql-java-kickstart:voyager-spring-boot-starter',
252-
'com.graphql-java-kickstart:playground-spring-boot-autoconfigure',
253-
'com.graphql-java-kickstart:playground-spring-boot-starter'
254-
]
239+
// bintray {
240+
// user = System.env.BINTRAY_USER ?: project.findProperty('BINTRAY_USER') ?: ''
241+
// key = System.env.BINTRAY_PASS ?: project.findProperty('BINTRAY_PASS') ?: ''
242+
// publications = ['mainProjectPublication']
243+
// publish = true
244+
// pkg {
245+
// repo = 'releases'
246+
// name = PROJECT_NAME
247+
// desc = PROJECT_DESC
248+
// licenses = [PROJECT_LICENSE]
249+
// vcsUrl = PROJECT_GIT_REPO_URL
250+
// userOrg = 'graphql-java-kickstart'
251+
// version {
252+
// name = project.version
253+
// gpg {
254+
// sign = true
255+
// }
256+
// mavenCentralSync {
257+
// user = System.env.OSS_USER_TOKEN_KEY ?: project.findProperty('OSS_USER_TOKEN_KEY') ?: ''
258+
// password = System.env.OSS_USER_TOKEN_PASS ?: project.findProperty('OSS_USER_TOKEN_PASS') ?: ''
259+
// }
260+
// }
261+
// }
262+
// }
263+
}
255264
}
256265

257266
task build {
258267
dependsOn subprojects.findResults { it.tasks.findByName('assemble') }
259268
dependsOn subprojects.findResults { it.tasks.findByName('check') }
260-
dependsOn subprojects.findResults { it.tasks.findByName('bintray') }
261269
}
262270

263271
wrapper {

‎example-graphql-subscription/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@ dependencies {
1515

1616
jar.enabled = false
1717
publish.enabled = false
18-
bintrayUpload.enabled = false
1918
publishToMavenLocal.enabled = false

‎example-graphql-tools/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ dependencies {
3333

3434
jar.enabled = false
3535
publish.enabled = false
36-
bintrayUpload.enabled = false
3736
publishToMavenLocal.enabled = false

‎example-request-scoped-dataloader/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ dependencies {
1313

1414
jar.enabled = false
1515
publish.enabled = false
16-
bintrayUpload.enabled = false
17-
publishToMavenLocal.enabled = false
16+
publishToMavenLocal.enabled = false

‎example-spring-common/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,4 @@ dependencies {
3434

3535
jar.enabled = false
3636
publish.enabled = false
37-
bintrayUpload.enabled = false
3837
publishToMavenLocal.enabled = false

‎example-webflux/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,4 @@ dependencies {
3131

3232
jar.enabled = false
3333
publish.enabled = false
34-
bintrayUpload.enabled = false
3534
publishToMavenLocal.enabled = false

‎example/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ dependencies {
3232

3333
jar.enabled = false
3434
publish.enabled = false
35-
bintrayUpload.enabled = false
3635
publishToMavenLocal.enabled = false

0 commit comments

Comments
 (0)