Merge pull request #240 from GerardSoleCa/master

Edit line 76 to place pom.xml correctly and dependency-jar generation
This commit is contained in:
Tony Tam 2014-12-23 20:31:26 -08:00
commit 25aef5fd6e
2 changed files with 17 additions and 2 deletions

View File

@ -47,7 +47,22 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
</configuration>
</plugin>
<!-- attach test jar -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>

View File

@ -71,6 +71,6 @@ class BasicAndroidJavaGenerator extends BasicJavaGenerator {
("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),
("jsonUtil.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "JsonUtil.java"),
("apiException.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiException.java"),
("pom.mustache", destinationDir, "pom.xml")
("pom.mustache", "generated-code/android-java", "pom.xml")
)
}