Up to a 2.0.1 release (the 2.0.0 one was invalid due to mod classifier)

yngbldjr · Jul 17, 2013 · ac5e269 · ac5e269
1 parent 880c3ee
commit ac5e269
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git 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
@@ -5,17 +5,14 @@ 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
 
 # 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
@@ -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
     }
   }
-}
+}