Skip to content
Permalink
Browse files

Upgrade to Griffon 2.12.0

  • Loading branch information
aalmiray committed Sep 2, 2017
1 parent f8efb49 commit ed8ce72e9ef435fc021fd4f529f09796d8e5aa67
File renamed without changes.
@@ -2,15 +2,14 @@
:linkattrs:
:project-name: griffon-jdbi-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"]

---

@@ -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 = [
@@ -1,7 +1,7 @@
group = org.codehaus.griffon.plugins
version = 2.0.0
version = 2.1.0
pluginBaseName = griffon-jdbi
griffonVersion = 2.11.0
griffonVersion = 2.12.0
griffonPlugin = true
publishJars = false
sourceCompatibility = 1.8
@@ -14,10 +14,10 @@ projectVcsUrl = https://github.com/griffon-plugins/griffon-jdbi-plugin
javadocFooter = Copyright © 2014-2017 Andres Almiray. All rights reserved.
projectLabels = griffon,plugin,datasource,jdbi
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
cglibVersion = 3.2.5
h2Version = 1.4.196
slf4jVersion = 1.7.25
junitVersion = 4.12
jdbiVersion = 2.59
jdbiVersion = 2.78
@@ -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 {
@@ -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
@@ -11,7 +11,7 @@ griffon {
apply from: rootProject.file('gradle/code-coverage.gradle')

dependencies {
compile 'org.codehaus.griffon.plugins:griffon-datasource-core:2.0.0'
compile 'org.codehaus.griffon.plugins:griffon-datasource-core:2.1.0'
compile "org.jdbi:jdbi:$jdbiVersion"

testCompileOnly "org.codehaus.griffon:griffon-groovy-compile:${griffon.version}"
@@ -20,15 +20,19 @@
import org.skife.jdbi.v2.Handle;
import org.skife.jdbi.v2.PreparedBatch;
import org.skife.jdbi.v2.Query;
import org.skife.jdbi.v2.ResultColumnMapperFactory;
import org.skife.jdbi.v2.ResultSetMapperFactory;
import org.skife.jdbi.v2.Script;
import org.skife.jdbi.v2.SqlObjectContext;
import org.skife.jdbi.v2.TimingCollector;
import org.skife.jdbi.v2.TransactionCallback;
import org.skife.jdbi.v2.TransactionConsumer;
import org.skife.jdbi.v2.TransactionIsolationLevel;
import org.skife.jdbi.v2.Update;
import org.skife.jdbi.v2.exceptions.TransactionFailedException;
import org.skife.jdbi.v2.tweak.ArgumentFactory;
import org.skife.jdbi.v2.tweak.ContainerFactory;
import org.skife.jdbi.v2.tweak.ResultColumnMapper;
import org.skife.jdbi.v2.tweak.ResultSetMapper;
import org.skife.jdbi.v2.tweak.SQLLog;
import org.skife.jdbi.v2.tweak.StatementBuilder;
@@ -68,6 +72,11 @@ public void close() {
delegate.close();
}

@Override
public boolean isClosed() {
return delegate.isClosed();
}

@Override
public void define(String key, Object value) {
delegate.define(key, value);
@@ -138,11 +147,21 @@ public Batch createBatch() {
return delegate.inTransaction(callback);
}

@Override
public void useTransaction(TransactionConsumer callback) throws TransactionFailedException {
delegate.useTransaction(callback);
}

@Override
public <ReturnType> ReturnType inTransaction(TransactionIsolationLevel level, TransactionCallback<ReturnType> callback) throws TransactionFailedException {
return delegate.inTransaction(level, callback);
}

@Override
public void useTransaction(TransactionIsolationLevel level, TransactionConsumer callback) throws TransactionFailedException {
delegate.useTransaction(level, callback);
}

@Override
public List<Map<String, Object>> select(String sql, Object... args) {
return delegate.select(sql, args);
@@ -203,6 +222,16 @@ public void registerMapper(ResultSetMapperFactory factory) {
delegate.registerMapper(factory);
}

@Override
public void registerColumnMapper(ResultColumnMapper mapper) {
delegate.registerColumnMapper(mapper);
}

@Override
public void registerColumnMapper(ResultColumnMapperFactory factory) {
delegate.registerColumnMapper(factory);
}

@Override
public <SqlObjectType> SqlObjectType attach(Class<SqlObjectType> sqlObjectType) {
return delegate.attach(sqlObjectType);
@@ -232,4 +261,14 @@ public void registerArgumentFactory(ArgumentFactory argumentFactory) {
public void registerContainerFactory(ContainerFactory<?> factory) {
delegate.registerContainerFactory(factory);
}

@Override
public void setSqlObjectContext(SqlObjectContext context) {
delegate.setSqlObjectContext(context);
}

@Override
public SqlObjectContext getSqlObjectContext() {
return delegate.getSqlObjectContext();
}
}
@@ -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'
}
}
@@ -1,6 +1,6 @@
<html>
<head>
<title>griffon-jdbi-plugin 1.0.0</title>
<title>griffon-jdbi-plugin 2.1.0</title>
</head>
<body>

0 comments on commit ed8ce72

Please sign in to comment.
You can’t perform that action at this time.