Upgrade to Griffon 2.12.0

griffon-plugins · Sep 2, 2017 · 049c363 · 049c363
1 parent 6f418b3
commit 049c363
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 20 deletions.
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
diff --git a/README.adoc b/README.adoc
@@ -2,15 +2,14 @@
 :linkattrs:
 :project-name: griffon-jpa-plugin
 
-image:http://img.shields.io/travis/griffon-plugins/{project-name}/master.svg["Build Status", link="https://travis-ci.org/griffon-plugins/{project-name}"]
-image:http://img.shields.io/coveralls/griffon-plugins/{project-name}/master.svg["Coverage Status", link="https://coveralls.io/r/griffon-plugins/{project-name}"]
-image:http://img.shields.io/badge/license-ASF2-blue.svg["Apache License 2", link="http://www.apache.org/licenses/LICENSE-2.0.txt"]
-image:https://api.bintray.com/packages/griffon/griffon-plugins/{project-name}/images/download.svg[link="https://bintray.com/griffon/griffon-plugins/{project-name}/_latestVersion"]
-
----
+image:https://img.shields.io/travis/griffon-plugins/{project-name}/master.svg["Build Status", link="https://travis-ci.org/griffon-plugins/{project-name}"]
+image:https://img.shields.io/coveralls/griffon-plugins/{project-name}/master.svg["Coverage Status", link="https://coveralls.io/r/griffon-plugins/{project-name}"]
+image:https://img.shields.io/badge/license-ASF2-blue.svg["Apache License 2", link="http://www.apache.org/licenses/LICENSE-2.0.txt"]
+image:https://img.shields.io/maven-central/v/org.codehaus.griffon.plugins/{project-name}.svg[Download, link="https://search.maven.org/#search|ga|1|{project-name}"]
+image:https://img.shields.io/bintray/v/griffon/griffon-plugins/{project-name}.svg[Download, link="https://bintray.com/griffon/griffon-plugins/{project-name}"]
 
 image:https://img.shields.io/gitter/room/griffon/griffon.svg[link="https://gitter.im/griffon/griffon]
-image:https://img.shields.io/badge/donations-Patreon-orange.svg[link="https://www.patreon.com/user?u=6609318"]
+image:https://img.shields.io/badge/donations-Patreon-f96854.svg[link="https://www.patreon.com/user?u=6609318"]
 
 ---
 

diff --git a/build.gradle b/build.gradle
@@ -15,8 +15,8 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'org.ajoberstar:gradle-git:1.3.2'
         classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.0'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.14.0'
-        classpath 'net.nemerosa:versioning:2.6.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
+        classpath 'net.nemerosa:versioning:2.6.1'
         classpath 'net.ltgt.gradle:gradle-apt-plugin:0.10'
     }
 }
@@ -107,6 +107,13 @@ subprojects { subproj ->
             from sourceSets.main.allSource
         }
 
+        task javadocJar(type: Jar) {
+            group 'Build'
+            description 'An archive of the Javadocs'
+            classifier 'javadoc'
+            from javadoc.destinationDir
+        }
+
         tasks.withType(AbstractCompile) {
             if (rootProject.hasProperty('lint') && rootProject.lint.toBoolean()) {
                 options.compilerArgs = [

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group                  = org.codehaus.griffon.plugins
-version                = 2.0.0
+version                = 2.1.0
 pluginBaseName         = griffon-jpa
-griffonVersion         = 2.11.0
+griffonVersion         = 2.12.0
 griffonPlugin          = true
 publishJars            = false
 sourceCompatibility    = 1.8
@@ -14,12 +14,12 @@ projectVcsUrl          = https://github.com/griffon-plugins/griffon-jpa-plugin
 javadocFooter          = Copyright &copy; 2014-2017 Andres Almiray. All rights reserved.
 projectLabels          = griffon,plugin,datasource,jpa
 jacocoVersion          = 0.7.9
-groovyVersion          = 2.4.11
+groovyVersion          = 2.4.12
 spockVersion           = 1.1-groovy-2.4
-cglibVersion           = 3.2.4
-h2Version              = 1.4.195
-hikaricpVersion        = 2.6.2
+cglibVersion           = 3.2.5
+h2Version              = 1.4.196
+hikaricpVersion        = 2.6.3
 slf4jVersion           = 1.7.25
 junitVersion           = 4.12
-persistenceVersion     = 2.1.1
-eclipselinkVersion     = 2.6.4
+persistenceVersion     = 2.2.0
+eclipselinkVersion     = 2.7.0
diff --git a/gradle/bom.gradle b/gradle/bom.gradle
@@ -3,6 +3,26 @@ apply plugin: 'com.jfrog.bintray'
 
 generateBom {
     additionalDependencies = []
+    pomConfig {
+        description = projectDescription
+        url         = projectWebsiteUrl
+        scm {
+            url = projectVcsUrl
+        }
+        licenses {
+            license {
+                name         = 'The Apache Software License, Version 2.0'
+                url          = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                distribution = 'repo'
+            }
+        }
+        developers {
+            developer {
+                id   = 'aalmiray'
+                name = 'Andres Almiray'
+            }
+        }
+    }
 }
 
 publishing {

diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -8,20 +8,30 @@ def pomConfig = {
     description project.projectDescription
     url project.projectWebsiteUrl
     inceptionYear project.projectInceptionYear
+    scm {
+        url project.projectVcsUrl
+    }
     licenses {
         license([:]) {
             name 'The Apache Software License, Version 2.0'
             url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
             distribution 'repo'
         }
     }
+    developers {
+        developer {
+            id 'aalmiray'
+            name 'Andres Almiray'
+        }
+    }
 }
 
 publishing {
     publications {
         mavenCustom(MavenPublication) {
             from components.java
             artifact sourceJar
+            artifact javadocJar
 
             pom.withXml {
                 // all dependencies should use the default scope (compile) but

diff --git a/subprojects/griffon-jpa-core/griffon-jpa-core.gradle b/subprojects/griffon-jpa-core/griffon-jpa-core.gradle
@@ -11,7 +11,7 @@ griffon {
 apply from: rootProject.file('gradle/code-coverage.gradle')
 
 dependencies {
-    compile 'org.codehaus.griffon.plugins:griffon-monitor-core:2.0.0'
+    compile 'org.codehaus.griffon.plugins:griffon-monitor-core:2.1.0'
     compile "org.eclipse.persistence:javax.persistence:$persistenceVersion"
 
     testRuntime("com.h2database:h2:$h2Version") { transitive = false }

diff --git a/subprojects/griffon-jpa-guide/griffon-jpa-guide.gradle b/subprojects/griffon-jpa-guide/griffon-jpa-guide.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2'
+        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
         classpath 'com.bmuschko:gradle-java2html-plugin:2.0'
     }
 }

diff --git a/subprojects/griffon-jpa-guide/src/javadoc/overview.html b/subprojects/griffon-jpa-guide/src/javadoc/overview.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <title>griffon-jpa-plugin 1.0.0</title>
+    <title>griffon-jpa-plugin 2.1.0</title>
 </head>
 <body>