ari4java · grahambrown11 · Mar 25, 2021 · Mar 25, 2021 · Mar 25, 2021
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ codegen/tmp/
 codegen/versions.md
 
 .build-local
+oss.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
 # ARI4Java Changelog
 
 ## [Unreleased]
-[Unreleased]: https://github.com/l3nz/ari4java/compare/v0.12.1...HEAD
+[Unreleased]: https://github.com/l3nz/ari4java/compare/v0.12.2...HEAD
 
+## [0.12.2]
+[0.12.2]: https://github.com/l3nz/ari4java/compare/v0.12.1...v0.12.2
+### Changed
+- groupId changed from `ch.loway.oss.ari4java` to `io.github.ari4java`
+
+### Added
 ## [0.12.1]
 [0.12.1]: https://github.com/l3nz/ari4java/compare/v0.12.0...v0.12.1
 ### Added

diff --git a/README.md b/README.md
@@ -21,11 +21,11 @@ across different versions.
 Simply add the library and an SLF4J implementation to your package config, here is an example using Gradle
 ```
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    compile 'ch.loway.oss.ari4java:ari4java:+'
+    compile 'io.github.ari4java:ari4java:+'
     compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.13.0'
 }
 ```

diff --git a/build.gradle b/build.gradle
@@ -2,17 +2,25 @@ plugins {
     id "java"
     id "jacoco"
     id "maven-publish"
-    id "com.jfrog.bintray" version "1.8.4"
-    id "com.github.spotbugs" version "3.0.0"
+    id "signing"
+    id "com.github.spotbugs" version "4.7.0"
     id "org.sonarqube" version "2.7.1"
 }
 
-group = "ch.loway.oss.ari4java"
-version = "0.12.1"
+group = "io.github.ari4java"
+version = "0.12.2"
+
+def projectUrl = "http://github.com/ari4java/ari4java"
+def build_number = "x"
+if (System.getenv("BUILD_NUMBER") != null) {
+    build_number = System.getenv("BUILD_NUMBER")
+}
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
 }
 
 sourceSets {
@@ -24,27 +32,23 @@ sourceSets {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
-    compile "com.fasterxml.jackson.core:jackson-core:2.10.1"
-    compile "com.fasterxml.jackson.core:jackson-databind:2.10.1"
-    compile "com.fasterxml.jackson.core:jackson-annotations:2.10.1"
-    compile "io.netty:netty-all:4.1.44.Final"
-    compile "javax.xml.bind:jaxb-api:2.3.1"
-    compile "org.slf4j:slf4j-api:1.7.30"
-
-    testCompile "junit:junit:4.10"
+    implementation "com.fasterxml.jackson.core:jackson-core:2.10.1"
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.10.1"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:2.10.1"
+    implementation "io.netty:netty-all:4.1.44.Final"
+    implementation "javax.xml.bind:jaxb-api:2.3.1"
+    implementation "org.slf4j:slf4j-api:1.7.30"
+
+    testImplementation "junit:junit:4.10"
     testImplementation "org.mockito:mockito-core:2.28.2"
     testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:2.13.0"
 
 }
 
-def build_number = "x"
-if (System.getenv("BUILD_NUMBER") != null) {
-    build_number = System.getenv("BUILD_NUMBER")
-}
 task buildProps(type: WriteProperties) {
     outputFile file("src/main/resources/build.properties")
     property "BUILD_NUMBER", build_number
@@ -68,22 +72,7 @@ javadoc {
     ]
     includes = inc.toSet()
     options.overview = "src/overview.html"
-}
-
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier.set("sources")
-    from sourceSets.main.allSource
-}
-
-javadoc.failOnError = false
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set("javadoc")
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
+    failOnError = false
 }
 
 test {
@@ -136,72 +125,75 @@ sonarqube {
 test.finalizedBy jacocoTestReport
 check.dependsOn jacocoTestCoverageVerification
 
-def projectUrl = "http://github.com/ari4java/ari4java"
-def pomConfig = {
-    licenses {
-        license {
-            name "LPGL-3.0"
-        }
-    }
-    developers {
-        developer {
-            name "Graham Brown"
-            email "[email protected]"
-        }
-        developer {
-            name "lenz e."
-            email "nomail@home"
-        }
-    }
-    scm {
-        url projectUrl
-    }
-}
-
 publishing {
     publications {
-        mavenPublication(MavenPublication) {
+        maven(MavenPublication) {
             from components.java
-            groupId = "ch.loway.oss.ari4java"
-            artifact sourcesJar {
-                classifier "sources"
-            }
-            artifact javadocJar {
-                classifier "javadoc"
+            pom {
+                name = project.name
+                description = "Asterisk ARI interface bindings for Java"
+                url = projectUrl
+                licenses {
+                    license {
+                        name = "LPGL-3.0"
+                    }
+                }
+                developers {
+                    developer {
+                        name = "Graham Brown"
+                        email = "[email protected]"
+                    }
+                    developer {
+                        name = "lenz e."
+                        email = "nomail@home"
+                    }
+                }
+                scm {
+                    url = projectUrl
+                }
             }
-            pom.withXml {
-                def root = asNode()
-                root.appendNode("description", "Asterisk ARI interface bindings for Java")
-                root.appendNode("name", project.name)
-                root.appendNode("url", projectUrl)
-                root.children().last() + pomConfig
+        }
+    }
+    repositories {
+        maven {
+            name = "sonatype"
+            url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            credentials {
+                username = System.getenv("SONATYPE_USER")
+                password = System.getenv("SONATYPE_PASS")
             }
         }
     }
+
+}
+
+signing {
+    def signingKeyId = System.getenv("PGP_ID")
+    def signingKey = System.getenv("PGP_KEY")
+    def signingPassword = System.getenv("PGP_PASS")
+    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    sign publishing.publications
 }
 
-bintray {
-    user = System.getenv("BINTRAY_USER")
-    key =  System.getenv("BINTRAY_KEY")
-    publications = ["mavenPublication"]
-    publish = true
-    pkg {
-        repo = "maven"
-        name = project.name
-        group = "ch.loway.oss.ari4java"
-        userOrg = "ari4java"
-        licenses = ["LGPL-3.0"]
-        vcsUrl = projectUrl
-        version {
-            name = project.version
-            desc = project.version
-            released = new Date()
+spotbugsMain {
+    reports {
+        html {
+            enabled = true
+        }
+        xml {
+            enabled = false
         }
     }
 }
 
-// To generate an HTML report instead of XML
-tasks.withType(com.github.spotbugs.SpotBugsTask) {
-    reports.xml.enabled = false
-    reports.html.enabled = true
+spotbugsTest {
+    ignoreFailures = true
+    reports {
+        html {
+            enabled = true
+        }
+        xml {
+            enabled = false
+        }
+    }
 }
diff --git a/codegen/build.gradle b/codegen/build.gradle
@@ -7,10 +7,10 @@ repositories {
 }
 
 dependencies {
-    compile 'com.fasterxml.jackson.core:jackson-core:2.9.6'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.6'
-    compile 'com.google.googlejavaformat:google-java-format:1.7'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.6'
+    implementation 'com.google.googlejavaformat:google-java-format:1.7'
 }
 
 java {

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -3,9 +3,6 @@ plugins {
 }
 
 repositories {
-    maven {
-        url  "https://dl.bintray.com/ari4java/maven"
-    }
     jcenter()
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,4 @@ codegen/tmp/
		codegen/versions.md

		.build-local
		oss.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,9 +3,6 @@ plugins { @@
     }
     repositories {
-        maven {
-            url  "https://dl.bintray.com/ari4java/maven"
-        }
         jcenter()
     }
@@ Expand Down @@