Skip to content

Commit 0f100f4

Browse files
grahambrown11grahambrown11
committed
add dates to CL, fix badge on README and note groupId change from which version and correct examples groupId, add JReleaser gradle plugin and use it for GH Action publish automation
1 parent 7a86af1 commit 0f100f4

7 files changed

Lines changed: 62 additions & 51 deletions

File tree

‎.github/workflows/gradle.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ on:
77
pull_request:
88
branches:
99
- master
10-
# release:
11-
# types: [published]
10+
release:
11+
types: [published]
1212

1313
jobs:
1414
build:
@@ -37,7 +37,7 @@ jobs:
3737
BUILD_NUMBER: ${{ env.GITHUB_RUN_NUMBER }}
3838
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
3939
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
40-
run: ./gradlew clean :codegen:runCodegen buildProps build bintrayUpload
40+
run: ./gradlew clean :codegen:runCodegen buildProps build publish jreleaserDeploy
4141
if: github.event_name == 'release'
4242
- name: Archive Reports
4343
uses: actions/upload-artifact@v4

‎.gitignore‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@ src/main/resources/build.properties
2727
codegen/tmp/
2828
codegen/versions.md
2929

30-
.build-local
31-
oss.yaml
32-
3330
# vagrant state folder
3431
.vagrant
3532

36-
# local build examples
33+
# local build
3734
.inc-examples
35+
oss.yaml
3836
# exclude keys
3937
examples/vagrant/asterisk/keys/*.key
4038
examples/vagrant/asterisk/keys/*.crt

‎CHANGELOG.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## [Unreleased]
44
[Unreleased]: https://github.com/ari4java/ari4java/compare/v0.17.0...HEAD
55

6-
## [0.18.0]
6+
## [0.18.0] - 2026-01-26
77
[0.18.0]: https://github.com/ari4java/ari4java/compare/v0.17.0...v0.18.0
88

99
### Added
@@ -17,20 +17,20 @@
1717
- Cannot wait for connection close due to using connection keep-alive (aka pooling)
1818
- Some methods in the Examples use the async approach
1919

20-
## [0.17.0]
20+
## [0.17.0] - 2024-02-24
2121
[0.17.0]: https://github.com/ari4java/ari4java/compare/v0.16.0...v0.17.0
2222
### Added
2323
- `AriVersion.ARI_8_0_0`
2424
- `AriVersion.ARI_9_0_0`
2525

26-
## [0.16.0]
26+
## [0.16.0] - 2022-06-11
2727
[0.16.0]: https://github.com/ari4java/ari4java/compare/v0.15.0...v0.16.0
2828
### Added
2929
- `AriVersion.ARI_4_1_4`
3030
- `AriVersion.ARI_6_0_1`
3131
- `AriVersion.ARI_7_0_1`
3232

33-
## [0.15.0]
33+
## [0.15.0] - 2021-12-26
3434
[0.15.0]: https://github.com/ari4java/ari4java/compare/v0.14.0...v0.15.0
3535
### Changed
3636
- Library updates
@@ -39,31 +39,31 @@
3939
### Fixed
4040
- Map `local_ssrc` & `remote_ssrc` in `RTPstat` model to `Long` instead of `Integer` #180
4141

42-
## [0.14.0]
42+
## [0.14.0] - 2021-10-24
4343
[0.14.0]: https://github.com/ari4java/ari4java/compare/v0.13.0...v0.14.0
4444
### Fixed
4545
- ARI API resource inconsistency due to using git history on `resource.json`, now git tags (aka released versions) are used
4646

47-
## [0.13.0]
47+
## [0.13.0] - 2021-08-14
4848
[0.13.0]: https://github.com/ari4java/ari4java/compare/v0.12.2...v0.13.0
4949
### Changed
5050
- Library updates
5151

5252
### Added
5353
- `AriVersion.ARI_8_0_0`
5454

55-
## [0.12.2]
55+
## [0.12.2] - 2021-03-25
5656
[0.12.2]: https://github.com/ari4java/ari4java/compare/v0.12.1...v0.12.2
5757
### Changed
5858
- groupId changed from `ch.loway.oss.ari4java` to `io.github.ari4java`
5959

6060
### Added
61-
## [0.12.1]
61+
## [0.12.1] - 2020-09-23
6262
[0.12.1]: https://github.com/ari4java/ari4java/compare/v0.12.0...v0.12.1
6363
### Added
6464
- ARI 4.1.3, 5.1.1 & 7.0.0
6565

66-
## [0.12.0]
66+
## [0.12.0] - 2020-06-24
6767
[0.12.0]: https://github.com/ari4java/ari4java/compare/v0.11.0...v0.12.0
6868
### Fixes
6969
- onFailure long after WS Connect error #156
@@ -72,13 +72,13 @@
7272
### Added
7373
- WS reconnect count #158
7474

75-
## [0.11.0]
75+
## [0.11.0] - 2020-03-21
7676
[0.11.0]: https://github.com/ari4java/ari4java/compare/v.0.10.0...v0.11.0
7777
### Added
7878
- Unit tests to increase coverage #11
7979
- New ARI binding
8080

81-
## [0.10.0]
81+
## [0.10.0] - 2020-02-23
8282
[0.10.0]: https://github.com/ari4java/ari4java/compare/v0.9.1...v.0.10.0
8383
### Fixed
8484
- UnsupportedOperationException #15

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The Asterisk REST Interface (ARI) bindings for Java.
44

5-
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.ari4java/ari4java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.github.ari4java/ari4java)
5+
![Maven Central](https://img.shields.io/maven-central/v/io.github.ari4java/ari4java)
66
[![javadoc](https://javadoc.io/badge2/io.github.ari4java/ari4java/javadoc.svg)](https://javadoc.io/doc/io.github.ari4java/ari4java)
77
[![Build](https://github.com/ari4java/ari4java/actions/workflows/gradle.yml/badge.svg?branch=master)](https://github.com/ari4java/ari4java/actions?query=workflow%3A%22ARI4Java+Build%22)
88

@@ -26,12 +26,12 @@ repositories {
2626
2727
dependencies {
2828
implementation 'io.github.ari4java:ari4java:+'
29-
implementation 'ch.qos.logback:logback-classic:1.2.10'
29+
implementation 'ch.qos.logback:logback-classic:1.5.26'
3030
}
3131
```
3232

3333
Due to the sun setting of JCenter the jar is now publish through Sonatype to Maven Central but under a new groupId.
34-
The groupId is now `io.github.ari4java` make sure you update your build files if you used `ch.loway.oss.ari4java`.
34+
Since 0.12.2 the groupId is now `io.github.ari4java` make sure you update your build files if you used `ch.loway.oss.ari4java`.
3535

3636
## Documentation
3737
- The [CHANGELOG](https://github.com/ari4java/ari4java/blob/master/CHANGELOG.md)

‎build.gradle‎

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id "signing"
66
id "com.github.spotbugs" version "6.4.8"
77
id "org.sonarqube" version "2.7.1"
8+
id "org.jreleaser" version "1.22.0"
89
}
910

1011
group = "io.github.ari4java"
@@ -46,7 +47,7 @@ dependencies {
4647
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
4748
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
4849
testImplementation 'org.mockito:mockito-core:4.2.0'
49-
testImplementation 'ch.qos.logback:logback-classic:1.5.25'
50+
testImplementation 'ch.qos.logback:logback-classic:1.5.26'
5051
}
5152

5253
tasks.register('buildProps', WriteProperties) {
@@ -112,6 +113,22 @@ jacocoTestCoverageVerification {
112113
}
113114
}
114115

116+
spotbugsMain {
117+
excludeFilter = file("spotbugs-exclude.xml")
118+
reports {
119+
xml.required.set(true)
120+
html.required.set(true)
121+
}
122+
}
123+
124+
spotbugsTest {
125+
ignoreFailures = true
126+
reports {
127+
xml.required.set(false)
128+
html.required.set(true)
129+
}
130+
}
131+
115132
sonarqube {
116133
properties {
117134
property "sonar.projectKey", "ari4java"
@@ -157,37 +174,33 @@ publishing {
157174
}
158175
repositories {
159176
maven {
160-
name = "sonatype"
161-
url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
162-
credentials {
163-
username = System.getenv("SONATYPE_USER")
164-
password = System.getenv("SONATYPE_PASS")
165-
}
177+
name = "staging-deploy"
178+
url = layout.buildDirectory.dir("staging-deploy")
166179
}
167180
}
168181

169182
}
170183

171-
signing {
172-
def signingKeyId = System.getenv("PGP_ID")
173-
def signingKey = System.getenv("PGP_KEY")
174-
def signingPassword = System.getenv("PGP_PASS")
175-
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
176-
sign publishing.publications
177-
}
178-
179-
spotbugsMain {
180-
excludeFilter = file("spotbugs-exclude.xml")
181-
reports {
182-
xml.required.set(true)
183-
html.required.set(true)
184+
jreleaser {
185+
signing {
186+
active = "ALWAYS"
187+
armored = true
188+
// Keys via Environment Variables:
189+
// JRELEASER_GPG_SECRET_KEY JRELEASER_GPG_PASSPHRASE JRELEASER_GPG_PUBLIC_KEY
184190
}
185-
}
186-
187-
spotbugsTest {
188-
ignoreFailures = true
189-
reports {
190-
xml.required.set(false)
191-
html.required.set(true)
191+
deploy {
192+
maven {
193+
mavenCentral {
194+
sonatype {
195+
active = "ALWAYS"
196+
url = "https://central.sonatype.com/api/v1/publisher"
197+
authorization = "BASIC"
198+
// user & pass via Environment Variables:
199+
// JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME JRELEASER_MAVENCENTRAL_SONATYPE_PASSWORD
200+
applyMavenCentralRules = true
201+
stagingRepository("build/staging-deploy")
202+
}
203+
}
204+
}
192205
}
193206
}

‎examples/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ dependencies {
1010
if (file("../.inc-examples").exists()) {
1111
implementation project(":")
1212
} else {
13-
implementation "ch.loway.oss.ari4java:ari4java:+"
13+
implementation "io.github.ari4java:ari4java:+"
1414
}
15-
implementation "ch.qos.logback:logback-classic:1.5.25"
15+
implementation "ch.qos.logback:logback-classic:1.5.26"
1616
implementation "io.netty:netty-all:4.2.9.Final"
1717
}
1818

‎examples/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if (file("../.build-examples").exists()) {
22
includeBuild("../") {
33
dependencySubstitution {
4-
substitute(module("ch.loway.oss.ari4java:ari4java")).using(project(":"))
4+
substitute(module("io.github.ari4java:ari4java")).using(project(":"))
55
}
66
}
77
}

0 commit comments

Comments
 (0)