updated jodatime version, added groupId and artifactId params

Author: fehguy

src/main/resources/Java/JsonUtil.mustache

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.core.JsonGenerator.Feature;
 
+import com.fasterxml.jackson.datatype.joda.*;
+
 public class JsonUtil {
   public static ObjectMapper mapper;
 

src/main/resources/Java/pom.mustache

@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>{{package}}</groupId>
-  <artifactId>api-client</artifactId>
+  <groupId>{{groupId}}</groupId>
+  <artifactId>{{artifactId}}</artifactId>
   <packaging>jar</packaging>
-  <name>api-client</name>
+  <name>{{artifactId}}</name>
   <version>{{apiVersion}}</version>
   <scm>
     <connection>scm:git:[email protected]:wordnik/swagger-mustache.git</connection>
@@ -181,7 +181,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
       <artifactId>jackson-datatype-joda</artifactId>
-      <version>${jackson-version}</version>
+      <version>2.1.5</version>
     </dependency>   
     <dependency>
       <groupId>joda-time</groupId>

src/main/resources/android-java/pom.mustache

@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
+  <groupId>{{groupId}}</groupId>
   <artifactId>{{artifactId}}</artifactId>
   <packaging>jar</packaging>
   <name>{{artifactId}}</name>
-  <version>1.0.0</version>
+  <version>{{apiVersion}}</version>
   <scm>
     <connection>scm:git:[email protected]:wordnik/swagger-mustache.git</connection>
     <developerConnection>scm:git:[email protected]:wordnik/swagger-codegen.git</developerConnection>

src/main/resources/scala/pom.mustache

@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
-  <artifactId>swagger-client</artifactId>
+  <groupId>{{groupId}}</groupId>
+  <artifactId>{{artifactId}}</artifactId>
   <packaging>jar</packaging>
-  <name>swagger-client</name>
-  <version>1.0</version>
+  <name>{{artifactId}}</name>
+  <version>{{apiVersion}}</version>
   <prerequisites>
     <maven>2.2.0</maven>
   </prerequisites>

src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala

@@ -58,6 +58,15 @@ class BasicAndroidJavaGenerator extends BasicJavaGenerator {
   // package for api classes
   override def apiPackage = Some("com.wordnik.client.api")
 
+  /**
+   * you should override these params for generating the pom.xml and processing
+   * additional params
+   **/
+  additionalParams ++= Map(
+    "artifactId" -> "android-client", 
+    "artifactVersion" -> "1.0.0",
+    "groupId" -> "com.wordnik")
+
   // supporting classes
   override def supportingFiles = List(
     ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),

src/main/scala/com/wordnik/swagger/codegen/BasicJavaGenerator.scala

@@ -183,6 +183,15 @@ class BasicJavaGenerator extends BasicGenerator {
     (declaredType, defaultValue)
   }
 
+  /**
+   * you should override these params for generating the pom.xml and processing
+   * additional params
+   **/
+  additionalParams ++= Map(
+    "artifactId" -> "java-client", 
+    "artifactVersion" -> "1.0.0",
+    "groupId" -> "com.wordnik")
+
   /**
    * we are defaulting to null values since the codegen uses java objects instead of primitives
    * If you change to primitives, you can put in the appropriate values (0.0f, etc).

src/main/scala/com/wordnik/swagger/codegen/BasicScalaGenerator.scala

@@ -205,6 +205,15 @@ class BasicScalaGenerator extends BasicGenerator {
   // escape keywords
   override def escapeReservedWord(word: String) = "`" + word + "`"
 
+  /**
+   * you should override these params for generating the pom.xml and processing
+   * additional params
+   **/
+  additionalParams ++= Map(
+    "artifactId" -> "scala-client", 
+    "artifactVersion" -> "1.0.0",
+    "groupId" -> "com.wordnik")
+
   // supporting classes
   override def supportingFiles = List(
     ("apiInvoker.mustache", destinationDir + "/com/wordnik/client", "ApiInvoker.scala"),