Skip to content

Commit d9a9221

Browse files
aesteveaesteve
authored
Versions upgrade (Vertx 3.9.0) (#42)
* Versions upgrade (Vertx: 3.9.0, AWS SDK: 2.12.0, Gradle 6.3) * Setup CI (using Github actions, tests, snapshot releases)
2 parents 390b42a + 29f8c96 commit d9a9221

12 files changed

+290
-332
lines changed

‎.github/workflows/ci-release.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# When a tag matching a semver number (like `1.1.0`) is pushed, then tyr to publish the version to bintray and create the matching release in Github
2+
name: CI-Release
3+
on:
4+
push:
5+
tags:
6+
- RELEASE-*
7+
8+
jobs:
9+
publish-release-bintray:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Get the version
14+
id: get_version
15+
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d '-' -f 2)
16+
- uses: actions/setup-java@v1
17+
with:
18+
java-version: 11
19+
- name: Release to Bintray
20+
uses: eskatos/gradle-command-action@v1
21+
with:
22+
gradle-version: 6.3
23+
arguments: test bintrayUpload
24+
env:
25+
BINTRAY_USER: ${{secrets.BINTRAY_USER}}
26+
BINTRAY_KEY: ${{secrets.BINTRAY_KEY}}
27+
- name: Creates a Release in Github
28+
uses: actions/create-release@latest
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
31+
with:
32+
tag_name: ${{ steps.get_version.outputs.VERSION }}
33+
release_name: ${{ steps.get_version.outputs.VERSION }}
34+
body: |
35+
Available in Bintray/Sonatype repositories under:
36+
`io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}`
37+
draft: false
38+
prerelease: false
39+

‎.github/workflows/ci-snapshot.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: CI-Snapshot
2+
on:
3+
push:
4+
tags:
5+
- SNAPSHOT-*
6+
7+
jobs:
8+
publish-snapshot-sonatype:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Get the version
13+
id: get_version
14+
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d '-' -f 2)
15+
- uses: actions/setup-java@v1
16+
with:
17+
java-version: 11
18+
- uses: eskatos/gradle-command-action@v1
19+
with:
20+
gradle-version: 6.3
21+
arguments: assemble publish -PossrhUsername=${{secrets.SONATYPE_NEXUS_USERNAME}} -PossrhPassword=${{secrets.SONATYPE_NEXUS_PASSWORD}}
22+
- name: Create Snapshot Release in Github
23+
uses: actions/create-release@latest
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
26+
with:
27+
tag_name: ${{ steps.get_version.outputs.VERSION }}-SNAPSHOT
28+
release_name: ${{ steps.get_version.outputs.VERSION }}-SNAPSHOT
29+
body: |
30+
Available in Sonatype SNAPSHOTs repository under:
31+
`io.reactiverse:aws-sdk:${{ steps.get_version.outputs.VERSION }}-SNAPSHOT`
32+
draft: true
33+
prerelease: true

‎.github/workflows/ci-test.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Always tests on every branch push / PR / master
2+
name: CI-Test
3+
on: push
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
java: [ 8, 11 ]
11+
name: "Run tests with JDK ${{ matrix.java }}"
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-java@v1
15+
with:
16+
java-version: ${{ matrix.java }}
17+
- name: Pre-Pull localstack image
18+
run: "docker pull localstack/localstack:0.10.2"
19+
- uses: eskatos/gradle-command-action@v1
20+
with:
21+
gradle-version: 6.3
22+
arguments: test -Dtests.integration=localstack

‎.travis.deploy.artifacts.sh

-6
This file was deleted.

‎.travis.yml

-24
This file was deleted.

‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Artifacts are published [here](https://search.maven.org/search?q=a:vertx-aws-sdk
1212

1313
| Project | Vert.x | AWS sdk |
1414
| ------- | ------ | ------- |
15+
| 0.5.0 | 3.9.0 | 2.12.0 |
16+
| 0.4.0 | 3.8.3 | 2.10.16 |
1517
| 0.3.0 | 3.8.1 | 2.7.8 |
1618

1719
## Documentation

‎build.gradle.kts

+59-50
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,59 @@
1-
val vertxVersion = "3.8.0"
2-
val awsSdkVersion = "2.7.8"
1+
val vertxVersion = "3.9.0"
2+
val awsSdkVersion = "2.12.0"
33
val junit5Version = "5.4.0"
44
val logbackVersion = "1.2.3"
55
val integrationOption = "tests.integration"
66

7+
group = "io.reactiverse"
8+
version = "0.5.0"
9+
710
plugins {
811
`java-library`
912
`maven-publish`
10-
signing
1113
jacoco
14+
id("com.jfrog.bintray") version "1.8.5"
1215
id("com.jaredsburrows.license") version "0.8.42"
1316
id("org.sonarqube") version "2.6"
1417
}
1518

16-
repositories {
17-
mavenCentral()
18-
maven {
19-
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
20-
}
21-
}
22-
23-
group = "io.reactiverse"
24-
version = "0.0.1-SNAPSHOT"
25-
26-
project.extra["isReleaseVersion"] = !version.toString().endsWith("SNAPSHOT")
27-
19+
// In order to publish SNAPSHOTs to Sonatype Snapshots repository => the CI should define such `ossrhUsername` and `ossrhPassword` properties
2820
if (!project.hasProperty("ossrhUsername")) {
29-
logger.warn("No ossrhUsername property defined in your Gradle properties file to deploy to Maven Central, using 'foo' to make the build pass")
21+
logger.warn("No ossrhUsername property defined in your Gradle properties file to deploy to Sonatype Snapshots, using 'foo' to make the build pass")
3022
project.extra["ossrhUsername"] = "foo"
3123
}
3224
if (!project.hasProperty("ossrhPassword")) {
33-
logger.warn("No ossrhPassword property defined in your Gradle properties file to deploy to Maven Central, using 'bar' to make the build pass")
25+
logger.warn("No ossrhPassword property defined in your Gradle properties file to deploy to Sonatype Snapshots, using 'bar' to make the build pass")
3426
project.extra["ossrhPassword"] = "bar"
3527
}
3628

29+
// Releases are published to Bintray under the Reactiverse organization
30+
// Then manually synced to Central
31+
bintray {
32+
user = System.getenv("BINTRAY_USER")
33+
key = System.getenv("BINTRAY_KEY")
34+
with(pkg) {
35+
userOrg = "reactiverse"
36+
repo = "releases"
37+
name = project.name
38+
setLicenses("Apache-2.0")
39+
vcsUrl = "https://github.com/reactiverse/aws-sdk"
40+
setLabels("vertx", "vert.x", "aws-sdk", "amazon web services")
41+
publicDownloadNumbers = true
42+
with(version) {
43+
name = project.version.toString()
44+
description = "${project.description}. Version: ${project.version}"
45+
}
46+
setPublications("mavenJava")
47+
}
48+
}
49+
50+
repositories {
51+
mavenCentral()
52+
maven {
53+
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
54+
}
55+
}
56+
3757
dependencies {
3858
api("io.vertx:vertx-core:$vertxVersion")
3959
api("software.amazon.awssdk:aws-core:$awsSdkVersion")
@@ -54,7 +74,7 @@ java {
5474
}
5575

5676
jacoco {
57-
toolVersion = "0.8.2"
77+
toolVersion = "0.8.5"
5878
}
5979

6080
tasks {
@@ -100,18 +120,14 @@ tasks {
100120
(options as StandardJavadocDocletOptions).links(
101121
"http://docs.oracle.com/javase/8/docs/api/",
102122
"https://sdk.amazonaws.com/java/api/latest/",
103-
"http://vertx.io/docs/3.8.0/apidocs/",
123+
"http://vertx.io/docs/3.9.0/apidocs/",
104124
"http://www.reactive-streams.org/reactive-streams-1.0.0-javadoc/",
105125
"http://netty.io/4.1/api/"
106126
)
107127
}
108128

109-
withType<Sign> {
110-
onlyIf { project.extra["isReleaseVersion"] as Boolean }
111-
}
112-
113129
withType<Wrapper> {
114-
gradleVersion = "5.4.1"
130+
gradleVersion = "6.3"
115131
}
116132
}
117133

@@ -121,9 +137,10 @@ publishing {
121137
from(components["java"])
122138
artifact(tasks["sourcesJar"])
123139
artifact(tasks["javadocJar"])
140+
setVersion(project.version)
124141
pom {
125142
name.set(project.name)
126-
description.set("Reactiverse AWS SDK 2 with Vert.x")
143+
description.set("Reactiverse AWS SDK v2 with Vert.x")
127144
url.set("https://github.com/reactiverse/aws-sdk")
128145
licenses {
129146
license {
@@ -144,32 +161,24 @@ publishing {
144161
url.set("https://github.com/reactiverse/aws-sdk")
145162
}
146163
}
147-
}
148-
}
149-
repositories {
150-
// To locally check out the poms
151-
maven {
152-
val releasesRepoUrl = uri("$buildDir/repos/releases")
153-
val snapshotsRepoUrl = uri("$buildDir/repos/snapshots")
154-
name = "BuildDir"
155-
url = if (project.extra["isReleaseVersion"] as Boolean) releasesRepoUrl else snapshotsRepoUrl
156-
}
157-
maven {
158-
val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
159-
val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
160-
name = "SonatypeOSS"
161-
url = if (project.extra["isReleaseVersion"] as Boolean) releasesRepoUrl else snapshotsRepoUrl
162-
credentials {
163-
val ossrhUsername: String by project
164-
val ossrhPassword: String by project
165-
username = ossrhUsername
166-
password = ossrhPassword
164+
repositories {
165+
// To locally check out the poms
166+
maven {
167+
name = "BuildDir"
168+
url = uri("$buildDir/repos/snapshots")
169+
}
170+
// Snapshots are published to Sonatype's repository directly
171+
maven {
172+
name = "SonatypeOSS"
173+
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
174+
credentials {
175+
val ossrhUsername: String by project
176+
val ossrhPassword: String by project
177+
username = ossrhUsername
178+
password = ossrhPassword
179+
}
180+
}
167181
}
168182
}
169183
}
170184
}
171-
172-
signing {
173-
sign(publishing.publications["mavenJava"])
174-
}
175-

‎gradle/wrapper/gradle-wrapper.jar

3.42 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+1-1
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-5.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)