diff --git a/build.gradle b/build.gradle index 3b750d2..e9495d9 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ def configurePom( def pom ) { name 'mod-jdbc-persistor' description 'JDBC Persistor Module for Vert.x' inceptionYear '2012' - packaging 'zip' + packaging 'jar' url 'https://github.com/timyates/mod-jdbc-persistor' developers { diff --git a/gradle.properties b/gradle.properties index 5795247..050c3eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ modowner=com.bloidonia modname=mod-jdbc-persistor # Your module version -version=2.0.0 +version=2.0.1 # The test timeout in seconds testtimeout=300 @@ -13,9 +13,6 @@ testtimeout=300 # Set to true if you want module dependencies to be pulled in and nested inside the module itself pullInDeps=true -# Set to true if you want the build to output a jar as well as a module zip file -produceJar=false - # The version of Groovy language to compile against (if you are using Groovy compiled verticles or VertxTests) groovyLangModVersion=2.0.0-CR2 diff --git a/gradle/vertx.gradle b/gradle/vertx.gradle index 1204721..a285327 100644 --- a/gradle/vertx.gradle +++ b/gradle/vertx.gradle @@ -44,16 +44,14 @@ targetCompatibility = '1.7' project.ext.moduleName = "$modowner~$modname~$version" -if (produceJar == 'false') { - jar.enabled = false - assert configurations.archives.artifacts.removeAll { it.file == jar.archivePath } -} - configurations { provided testCompile.extendsFrom provided } +jar.enabled = false +assert configurations.archives.artifacts.removeAll { it.file == jar.archivePath } + repositories { if (System.getenv("VERTX_DISABLE_MAVENLOCAL") == null) { // We don't want to use mavenLocal when running on CI - mavenLocal is only useful in Gradle for @@ -131,7 +129,6 @@ test { testLogging { exceptionFormat "full" } - systemProperty 'vertx.loadWithPlatformCL', "false" systemProperty 'vertx.mods', "build/mods" } @@ -207,7 +204,6 @@ task pullInDeps(dependsOn: copyMod, description: 'Pull in all the module depende def setSysProps() { System.setProperty("vertx.mods", "build/mods") - System.setProperty("vertx.loadWithPlatformCL", "false"); } def loadProperties(String sourceFileName) { @@ -231,4 +227,4 @@ plugins.withType(IdeaPlugin) { scopes.RUNTIME.minus += configurations.provided } } -} \ No newline at end of file +}