Skip to content

Commit 97dfa74

Browse files
wing328wing328
committed
Merge pull request #2137 from wing328/master
[Java] update pom.xml (okhttp-gson) to catch issue with build.gradle
2 parents f3582c3 + 516a941 commit 97dfa74

File tree

9 files changed

+49
-7
lines changed

9 files changed

+49
-7
lines changed

‎modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

+22
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,28 @@
104104
<target>1.6</target>
105105
</configuration>
106106
</plugin>
107+
<!-- For testing build.gradle -->
108+
<plugin>
109+
<groupId>org.codehaus.mojo</groupId>
110+
<artifactId>exec-maven-plugin</artifactId>
111+
<version>1.2.1</version>
112+
<executions>
113+
<execution>
114+
<id>gradle-test</id>
115+
<phase>integration-test</phase>
116+
<goals>
117+
<goal>exec</goal>
118+
</goals>
119+
<configuration>
120+
<executable>gradle</executable>
121+
<arguments>
122+
<argument>check</argument>
123+
</arguments>
124+
</configuration>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
107129
</plugins>
108130
</build>
109131
<dependencies>

‎samples/client/petstore/java/okhttp-gson/pom.xml

+20
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,26 @@
104104
<target>1.6</target>
105105
</configuration>
106106
</plugin>
107+
<plugin>
108+
<groupId>org.codehaus.mojo</groupId>
109+
<artifactId>exec-maven-plugin</artifactId>
110+
<version>1.2.1</version>
111+
<executions>
112+
<execution>
113+
<id>gradle-test</id>
114+
<phase>integration-test</phase>
115+
<goals>
116+
<goal>exec</goal>
117+
</goals>
118+
<configuration>
119+
<executable>gradle</executable>
120+
<arguments>
121+
<argument>check</argument>
122+
</arguments>
123+
</configuration>
124+
</execution>
125+
</executions>
126+
</plugin>
107127
</plugins>
108128
</build>
109129
<dependencies>

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ public ApiClient() {
145145

146146
// Setup authentications (key: authentication name, value: authentication).
147147
authentications = new HashMap<String, Authentication>();
148-
authentications.put("petstore_auth", new OAuth());
149148
authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
149+
authentications.put("petstore_auth", new OAuth());
150150
// Prevent the authentications from being modified.
151151
authentications = Collections.unmodifiableMap(authentications);
152152
}

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/ApiException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Map;
44
import java.util.List;
55

6-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
6+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-15T18:20:42.151+08:00")
77
public class ApiException extends Exception {
88
private int code = 0;
99
private Map<String, List<String>> responseHeaders = null;

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Configuration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-15T18:20:42.151+08:00")
44
public class Configuration {
55
private static ApiClient defaultApiClient = new ApiClient();
66

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/Pair.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-15T18:20:42.151+08:00")
44
public class Pair {
55
private String name = "";
66
private String value = "";

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/StringUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.client;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-15T18:20:42.151+08:00")
44
public class StringUtil {
55
/**
66
* Check if the given array contains the given value (with case-insensitive comparison).

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/ApiKeyAuth.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Map;
66
import java.util.List;
77

8-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
8+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-15T18:20:42.151+08:00")
99
public class ApiKeyAuth implements Authentication {
1010
private final String location;
1111
private final String paramName;

‎samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/auth/OAuth.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Map;
66
import java.util.List;
77

8-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-01-05T14:39:20.056+08:00")
8+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-02-15T18:20:42.151+08:00")
99
public class OAuth implements Authentication {
1010
private String accessToken;
1111

0 commit comments

Comments
 (0)