Skip to content

Commit 38ffb47

Browse files
OlegDokukaOlegDokuka
committed
Merge 1.0.x into master
Signed-off-by: Oleh Dokuka <[email protected]> Signed-off-by: Oleh Dokuka <[email protected]> Signed-off-by: Oleh Dokuka <[email protected]>
2 parents 133401e + c0ae0f5 commit 38ffb47

14 files changed

Lines changed: 35 additions & 97 deletions

File tree

‎.github/workflows/gradle-all.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@ jobs:
142142
run: chmod +x gradlew
143143
- name: Publish Packages to Artifactory
144144
if: ${{ matrix.jdk == '1.8' }}
145-
run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-${githubRef#refs/heads/}-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --no-daemon --stacktrace
145+
run: ./gradlew -PversionSuffix="-${githubRef#refs/heads/}-SNAPSHOT" -PbuildNumber="${buildNumber}" publishMavenPublicationToGitHubPackagesRepository --no-daemon --stacktrace
146146
env:
147-
bintrayUser: ${{ secrets.bintrayUser }}
148-
bintrayKey: ${{ secrets.bintrayKey }}
147+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149148
githubRef: ${{ github.ref }}
150149
buildNumber: ${{ github.run_number }}

‎.github/workflows/gradle-main.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,9 @@ jobs:
142142
run: chmod +x gradlew
143143
- name: Publish Packages to Artifactory
144144
if: ${{ matrix.jdk == '1.8' }}
145-
run: ./gradlew -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" artifactoryPublish --no-daemon --stacktrace
145+
run: ./gradlew -PversionSuffix="-SNAPSHOT" -PbuildNumber="${buildNumber}" publishMavenPublicationToGitHubPackagesRepository --no-daemon --stacktrace
146146
env:
147-
bintrayUser: ${{ secrets.bintrayUser }}
148-
bintrayKey: ${{ secrets.bintrayKey }}
147+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149148
buildNumber: ${{ github.run_number }}
150149
- name: Aggregate test reports with ciMate
151150
if: always()

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
id 'com.github.sherter.google-java-format' version '0.9' apply false
19-
id 'com.jfrog.artifactory' version '4.21.0' apply false
2019
id 'me.champeau.jmh' version '0.6.4' apply false
2120
id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
2221
id 'io.morethan.jmhreport' version '0.9.0' apply false

‎gradle/artifactory.gradle‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎gradle/github-pkg.gradle‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
subprojects {
22

3-
plugins.withType(JavaLibraryPlugin) {
4-
plugins.withType(MavenPublishPlugin) {
5-
publishing {
6-
repositories {
7-
maven {
8-
name = "GitHubPackages"
9-
url = uri("https://maven.pkg.github.com/rsocket/rsocket-java")
10-
credentials {
11-
username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
12-
password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
13-
}
3+
plugins.withType(MavenPublishPlugin) {
4+
publishing {
5+
repositories {
6+
maven {
7+
name = "GitHubPackages"
8+
url = uri("https://maven.pkg.github.com/rsocket/rsocket-java")
9+
credentials {
10+
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
11+
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
1412
}
1513
}
1614
}
15+
}
1716

18-
tasks.named("publish").configure {
19-
onlyIf { System.getenv('SKIP_RELEASE') != "true" }
20-
}
17+
tasks.named("publish").configure {
18+
onlyIf { System.getenv('SKIP_RELEASE') != "true" }
2119
}
2220
}
2321
}

‎gradle/publications.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply from: "${rootDir}/gradle/artifactory.gradle"
21
apply from: "${rootDir}/gradle/github-pkg.gradle"
32
apply from: "${rootDir}/gradle/sonotype.gradle"
43

‎gradle/sonotype.gradle‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
11
subprojects {
22
if (project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) {
3-
plugins.withType(JavaLibraryPlugin) {
4-
plugins.withType(MavenPublishPlugin) {
5-
plugins.withType(SigningPlugin) {
3+
plugins.withType(MavenPublishPlugin) {
4+
plugins.withType(SigningPlugin) {
65

7-
signing {
8-
//requiring signature if there is a publish task that is not to MavenLocal
9-
required { gradle.taskGraph.allTasks.any { it.name.toLowerCase().contains("publish") && !it.name.contains("MavenLocal") } }
10-
def signingKey = project.findProperty("signingKey")
11-
def signingPassword = project.findProperty("signingPassword")
6+
signing {
7+
//requiring signature if there is a publish task that is not to MavenLocal
8+
required { gradle.taskGraph.allTasks.any { it.name.toLowerCase().contains("publish") && !it.name.contains("MavenLocal") } }
9+
def signingKey = project.findProperty("signingKey")
10+
def signingPassword = project.findProperty("signingPassword")
1211

13-
useInMemoryPgpKeys(signingKey, signingPassword)
12+
useInMemoryPgpKeys(signingKey, signingPassword)
1413

15-
afterEvaluate {
16-
sign publishing.publications.maven
17-
}
14+
afterEvaluate {
15+
sign publishing.publications.maven
1816
}
17+
}
1918

20-
publishing {
21-
repositories {
22-
maven {
23-
name = "sonatype"
24-
url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2"
25-
credentials {
26-
username project.findProperty("sonatypeUsername")
27-
password project.findProperty("sonatypePassword")
28-
}
19+
publishing {
20+
repositories {
21+
maven {
22+
name = "sonatype"
23+
url = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
24+
credentials {
25+
username project.findProperty("sonatypeUsername")
26+
password project.findProperty("sonatypePassword")
2927
}
3028
}
3129
}

‎rsocket-bom/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ plugins {
1717
id 'java-platform'
1818
id 'maven-publish'
1919
id 'signing'
20-
id 'com.jfrog.artifactory'
2120
}
2221

2322
description = 'RSocket Java Bill of materials.'

‎rsocket-core/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ plugins {
1818
id 'java-library'
1919
id 'maven-publish'
2020
id 'signing'
21-
id 'com.jfrog.artifactory'
2221
id 'io.morethan.jmhreport'
2322
id 'me.champeau.jmh'
2423
id 'io.github.reyerizo.gradle.jcstress'

‎rsocket-load-balancer/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ plugins {
1818
id 'java-library'
1919
id 'maven-publish'
2020
id 'signing'
21-
id 'com.jfrog.artifactory'
2221
}
2322

2423
dependencies {

0 commit comments

Comments
 (0)