loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge branch 'master' into 3006/sbt_for_java_scala

Browse Source 
Conflicts:
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java
This commit is contained in:
clasnake
2016-06-03 00:43:43 +08:00
parent f0d3bd8f21 a3610f1c12
commit f4ba31964a
195 changed files with 2763 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
View File

@@ -68,6 +68,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.10</version>
<executions>
<execution>
<id>add_sources</id>
@@ -104,7 +105,7 @@
<target>1.7</target>
</configuration>
</plugin>
<!-- For testing build.gradle -->
<!-- For testing build.gradle, build.sbt -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -123,9 +124,21 @@
</arguments>
</configuration>
</execution>
<execution>
<id>sbt-test</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>sbt</executable>
<arguments>
<argument>publishLocal</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
@@ -164,5 +177,6 @@
<gson-version>2.6.2</gson-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<junit-version>4.12</junit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>