8000 Merge branch 'release/1.0.0-RC4' · FTTF-git/rsocket-java@775f1de · GitHub
[go: up one dir, main page]
Skip to content

Commit 775f1de

Browse files
OlegDokukaOlegDokuka
committed
Merge branch 'release/1.0.0-RC4'
2 parents 2e89fb8 + fedfcec commit 775f1de

File tree

15 files changed

+999
-276
lines changed

15 files changed

+999
-276
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Frames can be printed out to help debugging. Set the logger `io.rsocket.FrameLog
5252

5353
## Trivial Client
5454

55-
```
55+
```java
5656
package io.rsocket.transport.netty;
5757

5858
import io.rsocket.Payload;

‎build.gradle

Lines changed: 27 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616

1717
plugins {
18-
id 'com.gradle.build-scan' version '1.16'
18+
id 'com.gradle.build-scan' version '2.4.2'
1919

20-
id 'com.github.sherter.google-java-format' version '0.7.1' apply false
21-
id 'com.jfrog.artifactory' version '4.7.3' apply false
20+
id 'com.github.sherter.google-java-format' version '0.8' apply false
21+
id 'com.jfrog.artifactory' version '4.9.10' apply false
2222
id 'com.jfrog.bintray' version '1.8.4' apply false
2323
id 'me.champeau.gradle.jmh' version '0.4.8' apply false
2424
id 'io.spring.dependency-management' version '1.0.7.RELEASE' apply false
@@ -28,74 +28,67 @@ plugins {
2828
subprojects {
2929
apply plugin: 'io.spring.dependency-management'
3030
apply plugin: 'com.github.sherter.google-java-format'
31-
32-
ext['reactor-bom.version'] = 'Dysprosium-M3'
31+
32+
ext['reactor-bom.version'] = 'Dysprosium-RELEASE'
3333
ext['logback.version'] = '1.2.3'
3434
ext['findbugs.version'] = '3.0. 57A6 2'
35-
ext['netty.version'] = '4.1.37.Final'
35+
ext['netty-bom.version'] = '4.1.37.Final'
3636
ext['netty-boringssl.version'] = '2.0.25.Final'
3737
ext['hdrhistogram.version'] = '2.1.10'
3838
ext['mockito.version'] = '2.25.1'
3939
ext['slf4j.version'] = '1.7.25'
4040
ext['jmh.version'] = '1.21'
41-
ext['junit.version'] = '5.1.0'
41+
ext['junit.version'] = '5.5.2'
4242
ext['hamcrest.version'] = '1.3'
4343
ext['micrometer.version'] = '1.0.6'
4444
ext['assertj.version'] = '3.11.1'
4545

46+
group = "io.rsocket"
47+
4648
googleJavaFormat {
4749
toolVersion = '1.6'
4850
}
4951

5052
ext {
51-
if (project.hasProperty('versionSuffix')) {
52-
project.version += project.getProperty('versionSuffix')
53-
}
53+
if (project.hasProperty('versionSuffix')) {
54+
project.version += project.getProperty('versionSuffix')
55+
}
5456
}
5557

5658
dependencyManagement {
5759
imports {
5860
mavenBom "io.projectreactor:reactor-bom:${ext['reactor-bom.version']}"
61+
mavenBom "io.netty:netty-bom:${ext['netty-bom.version']}"
62+
mavenBom "org.junit:junit-bom:${ext['junit.version']}"
5963
}
6064

6165
dependencies {
6266
dependency "ch.qos.logback:logback-classic:${ext['logback.version']}"
6367
dependency "com.google.code.findbugs:jsr305:${ext['findbugs.version']}"
64-
dependency "io.netty:netty-buffer:${ext['netty.version']}"
6568
dependency "io.netty:netty-tcnative-boringssl-static:${ext['netty-boringssl.version']}"
6669
dependency "io.micrometer:micrometer-core:${ext['micrometer.version']}"
6770
dependency "org.assertj:assertj-core:${ext['assertj.version']}"
6871
dependency "org.hdrhistogram:HdrHistogram:${ext['hdrhistogram.version']}"
6972
dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"
70-
7173
dependencySet(group: 'org.mockito', version: ext['mockito.version']) {
7274
entry 'mockito-junit-jupiter'
7375
entry 'mockito-core'
7476
}
75-
76-
dependencySet(group: 'org.junit.jupiter', version: ext['junit.version']) {
77-
entry 'junit-jupiter-api'
78-
entry 'junit-jupiter-engine'
79-
entry 'junit-jupiter-params'
80-
}
81-
8277
// TODO: Remove after JUnit5 migration
8378
dependency 'junit:junit:4.12'
8479
dependency "org.hamcrest:hamcrest-library:${ext['hamcrest.version']}"
85-
dependencySet(group: 'org.junit.vintage', version: ext['junit.version']) {
86-
entry 'junit-vintage-engine'
87-
}
88-
8980
dependencySet(group: 'org.openjdk.jmh', version: ext['jmh.version']) {
9081
entry 'jmh-core'
9182
entry 'jmh-generator-annprocess'
9283
}
9384
}
85+
generatedPomCustomization {
86+
enabled = false
87+
}
9488
}
9589

9690
repositories {
9791
mavenCentral()
98-
maven { url 'http://repo.spring.io/milestone' } // temporary for Reactor Dysprosium
9992

10093
if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
10194
maven { url 'http://repo.spring.io/libs-snapshot' }
@@ -123,7 +116,7 @@ subprojects {
123116

124117
systemProperty "io.netty.leakDetection.level", "ADVANCED"
125118
}
126-
119+
127120
tasks.named("javadoc").configure {
128121
onlyIf { System.getenv('SKIP_RELEASE') != "true" }
129122
}
@@ -139,77 +132,23 @@ subprojects {
139132
classifier 'javadoc'
140133
from javadoc.destinationDir
141134
}
142-
}
143135

144-
plugins.withType(MavenPublishPlugin) {
145-
publishing {
146-
publications {
147-
maven(MavenPublication) {
148-
groupId 'io.rsocket'
149-
150-
from components.java
151-
152-
artifact sourcesJar
153-
artifact javadocJar
154-
155-
pom.withXml {
156-
asNode().':version' + {
157-
resolveStrategy = DELEGATE_FIRST
158-
159-
name project.name
160-
description project.description
161-
url 'http://rsocket.io'
162-
163-
licenses {
164-
license {
165-
name 'The Apache Software License, Version 2.0'
166-
url 'http://www.apache.org/license/LICENSE-2.0.txt'
167-
}
168-
}
169-
170-
developers {
171-
developer {
172-
id 'robertroeser'
173-
name 'Robert Roeser'
174-
email 'robert@netifi.com'
175-
}
176-
developer {
177-
id 'rdegnan'
178-
name 'Ryland Degnan'
179-
email 'ryland@netifi.com'
180-
}
181-
developer {
182-
id 'yschimke'
183-
name 'Yuri Schimke'
184-
email 'yuri@schimke.ee'
185-
}
186-
developer {
187-
id 'OlegDokuka'
188-
name 'Oleh Dokuka'
189-
email 'oleh@netifi.com'
190-
}
191-
developer {
192-
id 'mostroverkhov'
193-
name 'Maksym Ostroverkhov'
194-
email 'm.ostroverkhov@gmail.com'
195-
}
196-
}
197-
198-
scm {
199-
connection 'scm:git:https://github.com/rsocket/rsocket-java.git'
200-
developerConnection 'scm:git:https://github.com/rsocket/rsocket-java.git'
201-
url 'https://github.com/rsocket/rsocket-java'
202-
}
203-
}
136+
plugins.withType(MavenPublishPlugin) {
137+
publishing {
138+
publications {
139+
maven(MavenPublication) {
140+
from components.java
141+
artifact sourcesJar
142+
artifact javadocJar
204143
}
205144
}
206145
}
207146
}
208147
}
148+
209149
}
210150

211-
apply from: 'artifactory.gradle'
212-
apply from: 'bintray.gradle'
151+
apply from: "${rootDir}/gradle/publications.gradle"
213152

214153
buildScan {
215154
termsOfServiceUrl = 'https://gradle.com/terms-of-service'

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
11 10000 11
# See the License for the specific language governing permissions and
1212
# limitations under the License.
1313
#
14-
version=1.0.0-RC3
14+
version=1.0.0-RC4

‎artifactory.gradle renamed to ‎gradle/artifactory.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey')) {
3131
}
3232

3333
defaults {
34-
publications('maven')
34+
publications(publishing.publications.maven)
3535
}
3636
}
3737
}

‎bintray.gradle renamed to ‎gradle/bintray.gradle

File renamed without changes.

‎gradle/publications.gradle

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
apply from: "${rootDir}/gradle/artifactory.gradle"
2+
apply from: "${rootDir}/gradle/bintray.gradle"
3+
4+
subprojects {
5+
plugins.withType(MavenPublishPlugin) {
6+
publishing {
7+
publications {
8+
maven(MavenPublication) {
9+
pom {
10+
name = project.name
11+
groupId = 'io.rsocket'
12+
description = project.description
13+
url = 'http://rsocket.io'
14+
licenses {
15+
license {
16+
name = "The Apache Software License, Version 2.0"
17+
url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
18+
distribution = "repo"
19+
}
20+
}
21+
developers {
22+
developer {
23+
id = 'robertroeser'
24+
name = 'Robert Roeser'
25+
email = 'robert@netifi.com'
26+
}
27+
developer {
28+
id = 'rdegnan'
29+
name = 'Ryland Degnan'
30+
email = 'ryland@netifi.com'
31+
}
32+
developer {
33+
id = 'yschimke'
34+
name = 'Yuri Schimke'
35+
email = 'yuri@schimke.ee'
36+
}
37+
developer {
38+
id = 'OlegDokuka'
39+
name = 'Oleh Dokuka'
40+
email = 'oleh@netifi.com'
41+
}
42+
developer {
43+
id = 'mostroverkhov'
44+
name = 'Maksym Ostroverkhov'
45+
email = 'm.ostroverkhov@gmail.com'
46+
}
47+
}
48+
scm {
49+
connection = 'scm:git:https://github.com/rsocket/rsocket-java.git'
50+
developerConnection = 'scm:git:https://github.com/rsocket/rsocket-java.git'
51+
url = 'https://github.com/rsocket/rsocket-java'
52+
}
53+
versionMapping {
54+
usage('java-api') {
55+
fromResolutionResult()
56+
}
57+
usage('java-runtime') {
58+
fromResolutionResult()
59+
}
60+
}
61+
}
62+
}
63+
}
64+
}
65+
}
66+
}

‎gradle/wrapper/gradle-wrapper.jar

1.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)
0