Skip to content

Commit a3610f1

Browse files
committed
[Java] fix warning in pom.xml (java okhttp-gson) (#3023)
* fix warning in pom.xml * minor fix to pom (okhttp-gson)
1 parent 91c3550 commit a3610f1

File tree

8 files changed

+25
-18
lines changed

8 files changed

+25
-18
lines changed

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<plugin>
6969
<groupId>org.codehaus.mojo</groupId>
7070
<artifactId>build-helper-maven-plugin</artifactId>
71+
<version>1.10</version>
7172
<executions>
7273
<execution>
7374
<id>add_sources</id>
@@ -104,7 +105,7 @@
104105
<target>1.7</target>
105106
</configuration>
106107
</plugin>
107-
<!-- For testing build.gradle -->
108+
<!-- For testing build.gradle, build.sbt -->
108109
<plugin>
109110
<groupId>org.codehaus.mojo</groupId>
110111
<artifactId>exec-maven-plugin</artifactId>
@@ -123,9 +124,21 @@
123124
</arguments>
124125
</configuration>
125126
</execution>
127+
<execution>
128+
<id>sbt-test</id>
129+
<phase>integration-test</phase>
130+
<goals>
131+
<goal>exec</goal>
132+
</goals>
133+
<configuration>
134+
<executable>sbt</executable>
135+
<arguments>
136+
<argument>publishLocal</argument>
137+
</arguments>
138+
</configuration>
139+
</execution>
126140
</executions>
127141
</plugin>
128-
129142
</plugins>
130143
</build>
131144
<dependencies>
@@ -164,5 +177,6 @@
164177
<gson-version>2.6.2</gson-version>
165178
<maven-plugin-version>1.0.0</maven-plugin-version>
166179
<junit-version>4.12</junit-version>
180+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
167181
</properties>
168182
</project>

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<plugin>
6969
<groupId>org.codehaus.mojo</groupId>
7070
<artifactId>build-helper-maven-plugin</artifactId>
71+
<version>1.10</version>
7172
<executions>
7273
<execution>
7374
<id>add_sources</id>
@@ -104,7 +105,7 @@
104105
<target>1.7</target>
105106
</configuration>
106107
</plugin>
107-
<!-- For testing build.gradle -->
108+
<!-- For testing build.gradle, build.sbt -->
108109
<plugin>
109110
<groupId>org.codehaus.mojo</groupId>
110111
<artifactId>exec-maven-plugin</artifactId>
@@ -123,14 +124,6 @@
123124
</arguments>
124125
</configuration>
125126
</execution>
126-
</executions>
127-
</plugin>
128-
<!-- For testing build.sbt -->
129-
<plugin>
130-
<groupId>org.codehaus.mojo</groupId>
131-
<artifactId>exec-maven-plugin</artifactId>
132-
<version>1.2.1</version>
133-
<executions>
134127
<execution>
135128
<id>sbt-test</id>
136129
<phase>integration-test</phase>
@@ -146,7 +139,6 @@
146139
</execution>
147140
</executions>
148141
</plugin>
149-
150142
</plugins>
151143
</build>
152144
<dependencies>
@@ -185,5 +177,6 @@
185177
<gson-version>2.6.2</gson-version>
186178
<maven-plugin-version>1.0.0</maven-plugin-version>
187179
<junit-version>4.12</junit-version>
180+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
188181
</properties>
189182
</project>

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

Lines changed: 1 addition & 1 deletion
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-05-31T22:17:12.179+08:00")
6+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+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

Lines changed: 1 addition & 1 deletion
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-05-31T22:17:12.179+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+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

Lines changed: 1 addition & 1 deletion
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-05-31T22:17:12.179+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+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

Lines changed: 1 addition & 1 deletion
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-05-31T22:17:12.179+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+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

Lines changed: 1 addition & 1 deletion
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-05-31T22:17:12.179+08:00")
8+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+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

Lines changed: 1 addition & 1 deletion
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-05-31T22:17:12.179+08:00")
8+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T16:59:44.170+08:00")
99
public class OAuth implements Authentication {
1010
private String accessToken;
1111

0 commit comments

Comments
 (0)