Merge remote-tracking branch 'refs/remotes/swagger-api/master' into JSR310-Clients

This commit is contained in:
ant3
2016-06-19 22:40:27 +01:00
147 changed files with 2952 additions and 84 deletions

View File

@@ -98,6 +98,15 @@ public class ApiClient {
return json;
}
public Client getHttpClient() {
return httpClient;
}
public ApiClient setHttpClient(Client httpClient) {
this.httpClient = httpClient;
return this;
}
public String getBasePath() {
return basePath;
}

View File

@@ -110,27 +110,6 @@
{{/java8}}
</configuration>
</plugin>
<!-- For testing build.gradle -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions>
<execution>
<id>gradle-test</id>
<phase>integration-test</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>gradle</executable>
<arguments>
<argument>check</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>