Build updates

README.adoc

@@ -1,18 +1,22 @@
 = Json-lib
-:version: 3.0.1
-:project-name: json-lib
 :linkattrs:
+:project-owner:   kordamp
+:project-repo:    maven
+:project-name:    json-lib
+:project-group:   org.kordamp.json
+:project-version: 3.0.1
 
-image:https://img.shields.io/travis/aalmiray/{project-name}/master.svg?logo=travis["Build Status", link="https://travis-ci.org/aalmiray/{project-name}"]
-image:https://img.shields.io/badge/license-ASF2-blue.svg?logo=apache["Apache License 2", link="http://www.apache.org/licenses/LICENSE-2.0.txt"]
-image:https://api.bintray.com/packages/aalmiray/kordamp/{project-name}/images/download.svg[link="https://bintray.com/aalmiray/kordamp/{project-name}/_latestVersion"]
-image:https://img.shields.io/badge/donations-Patreon-f96854.svg?logo=patreon[link="https://www.patreon.com/user?u=6609318"]
+image:http://img.shields.io/travis/{project-owner}/{project-name}/master.svg["Build Status (travis)", link="https://travis-ci.org/{project-owner}/{project-name}"]
+image:http://img.shields.io/badge/license-ASL2-blue.svg["ASL2 Licensed", link="http://opensource.org/licenses/ASL2"]
+image:https://api.bintray.com/packages/{project-owner}/{project-repo}/{project-name}/images/download.svg[link="https://bintray.com/{project-owner}/{project-repo}/{project-name}/_latestVersion"]
+image:https://img.shields.io/maven-central/v/{project-group}/{project-name}-core.svg[Download, link="https://search.maven.org/#search|ga|1|{project-name}"]
+image:https://img.shields.io/badge/donations-Patreon-orange.svg[link="https://www.patreon.com/user?u=6609318"]
 
 ---
 
 image::resources/images/json-lib.png[]
 
 JSON-lib is a java library for transforming beans, maps, collections, java arrays and XML to JSON and back again to beans and DynaBeans.
 
-Refer to the link:http://aalmiray.github.io/json-lib/[project guide, window="_blank"] for
+Refer to the link:http://{project-owner}.github.io/json-lib/[project guide, window="_blank"] for
 further information on configuration and usage.

build.gradle

@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 plugins {
-    id 'org.kordamp.gradle.kordamp-parentpom' version '1.9.1'
-    id 'org.kordamp.gradle.java-project'      version '0.30.3'
-    id 'org.kordamp.gradle.source-xref'       version '0.30.3'
+    id 'org.kordamp.gradle.kordamp-parentpom' version '1.10.0'
+    id 'org.kordamp.gradle.source-xref'       version '0.31.0'
+    id 'org.kordamp.gradle.clirr'             version '0.31.0'
 } 
 
 config {
@@ -98,17 +98,15 @@ config {
         }
     }
 
-    sourceXref {
-        inputEncoding = 'UTF-8'
+    docs {
+        sourceXref {
+            inputEncoding = 'UTF-8'
+        }
     }
 
-	// clirr {
-	//     baseline = [project.group, project.name, project.previousVersion].join(':')
-	// }
-
-    javadoc {
-        enabled = true
-    }
+	clirr {
+	    baseline = [project.group, project.name, project.previousVersion].join(':')
+	}
 }
 
 allprojects {

gradle.properties

@@ -1,7 +1,32 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2006-2019 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 group               = org.kordamp.json
 version             = 3.0.2-SNAPSHOT
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-previousVersion = 2.4
-slf4jVersion    = 1.7.28
+previousVersion         = 3.0.1
+commonsLangVersion      = 3.9
+commonsBeanutilsVersion = 1.9.3
+junitVersion            = 4.12
+slf4jVersion            = 1.7.29
+
+org.gradle.daemon   = true
+org.gradle.caching  = true
+org.gradle.parallel = true

settings.gradle

@@ -27,7 +27,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'org.kordamp.gradle:settings-gradle-plugin:0.30.3'
+        classpath 'org.kordamp.gradle:settings-gradle-plugin:0.31.0'
     }
 }
 apply plugin: 'org.kordamp.gradle.settings'

subprojects/guide/guide.gradle

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 plugins {
-    id 'org.kordamp.gradle.guide'   version '0.29.0'
+    id 'org.kordamp.gradle.guide'   version '0.31.0'
     id 'org.ajoberstar.git-publish' version '0.3.2'
 }
 
@@ -35,33 +35,3 @@ asciidoctor {
         'source-highlighter'   : 'prettify'
     ]
 }
-
-afterEvaluate {
-    project.tasks.findByName('createGuide')
-
-    gitPublish {
-        repoUri = rootProject.extensions.findByName('config').info.links.scm
-        branch  = 'gh-pages'
-        contents {
-            from project.tasks.findByName('createGuide').outputs.files
-        }
-        commitMessage = "Publish guide for $version"
-    }
-
-    gitPublishCommit.dependsOn(project.tasks.findByName('createGuide'))
-}
-
-gradle.addBuildListener(new BuildAdapter(){
-    @Override
-    void projectsEvaluated(Gradle gradle) {
-        def createGuideTask = project.tasks.findByName('createGuide')
-
-        def aggregateSourceXrefTask = rootProject.tasks.findByName('aggregateSourceXref')
-
-        createGuideTask.finalizedBy project.tasks.create('copyAggregateXref', Copy) {
-            dependsOn aggregateSourceXrefTask
-            destinationDir = project.file("${createGuideTask.destinationDir}/api-xref")
-            from aggregateSourceXrefTask.outputDirectory
-        }
-    }
-})

subprojects/json-lib-core/json-lib-core.gradle

@@ -19,6 +19,22 @@ plugins {
     id 'java-library'
 }
 
+config {
+    clirr {
+//        enabled  = false
+        baseline = [project.group, project.name, project.previousVersion].join(':')
+    }
+}
+
+configurations.all {
+    resolutionStrategy.force 'xml-apis:xml-apis:2.0.2',
+        "org.apache.commons:commons-lang3:$commonsLangVersion",
+        "org.slf4j:slf4j-api:$slf4jVersion",
+        "junit:junit:$junitVersion",
+        "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion",
+        "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+}
+
 dependencies {
     def compileExcludingCommonsLogging = { String dependency ->
         compile(dependency)  {
@@ -32,19 +48,19 @@ dependencies {
         }
     }
 
-    compile('junit:junit:4.12')
-    compileExcludingCommonsLogging('commons-beanutils:commons-beanutils:1.9.3')
+    compile("junit:junit:$junitVersion")
+    compileExcludingCommonsLogging("commons-beanutils:commons-beanutils:$commonsBeanutilsVersion")
     compileExcludingCommonsLogging('org.apache.commons:commons-collections4:4.4')
-    compileExcludingCommonsLogging('org.apache.commons:commons-lang3:3.9')
+    compileExcludingCommonsLogging("org.apache.commons:commons-lang3:$commonsLangVersion")
 
     compile("org.slf4j:slf4j-api:$slf4jVersion")
     compile("org.slf4j:jcl-over-slf4j:$slf4jVersion")  {
-        exclude group: 'org.slf4j', module: 'slf4j-api'
+        exclude group: 'org.slf4j', module: 'slf4j-compile'
     }
 
     // the following should be marked as optional
     compileExcludingCommonsLogging('xom:xom:1.3.2')
-    compileExcludingCommonsLogging('org.kordamp.ezmorph:ezmorph:2.0.0')
+    compileExcludingCommonsLogging('org.kordamp.ezmorph:ezmorph-core:3.0.0')
 
     testCompileExcludingCommonsLogging('xmlunit:xmlunit:1.6')
     testCompile('uk.org.lidalia:slf4j-test:1.2.0')