File tree Expand file tree Collapse file tree 8 files changed +46
-11
lines changed
samples/client/petstore/java/default
src/main/java/io/swagger/client Expand file tree Collapse file tree 8 files changed +46
-11
lines changed Original file line number Diff line number Diff line change 13
13
14
14
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
15
15
hs_err_pid *
16
+
17
+ # build files
18
+ ** /target
19
+ target
20
+ .gradle
21
+ build
Original file line number Diff line number Diff line change 14
14
15
15
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
16
16
#foo/**/qux
17
- # Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
17
+ # This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
18
18
19
19
# You can also negate patterns with an exclamation (!).
20
20
# For example, you can ignore all files in a docs folder with the file extension .md:
Original file line number Diff line number Diff line change
1
+ #
2
+ # Generated by: https://github.com/swagger-api/swagger-codegen.git
3
+ #
4
+ # Licensed under the Apache License, Version 2.0 (the "License");
5
+ # you may not use this file except in compliance with the License.
6
+ # You may obtain a copy of the License at
7
+ #
8
+ # http://www.apache.org/licenses/LICENSE-2.0
9
+ #
10
+ # Unless required by applicable law or agreed to in writing, software
11
+ # distributed under the License is distributed on an "AS IS" BASIS,
12
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ # See the License for the specific language governing permissions and
14
+ # limitations under the License.
15
+ #
16
+ language : java
17
+ jdk :
18
+ - oraclejdk8
19
+ - oraclejdk7
20
+ before_install :
21
+ # ensure gradlew has proper permission
22
+ - chmod a+x ./gradlew
23
+ script :
24
+ # test using maven
25
+ - mvn test
26
+ # uncomment below to test using gradle
27
+ # - gradle test
28
+ # uncomment below to test using sbt
29
+ # - sbt test
Original file line number Diff line number Diff line change @@ -77,7 +77,7 @@ if(hasProperty('target') && target == 'android') {
77
77
78
78
apply plugin : ' java'
79
79
apply plugin : ' maven'
80
-
80
+
81
81
sourceCompatibility = JavaVersion . VERSION_1_7
82
82
targetCompatibility = JavaVersion . VERSION_1_7
83
83
@@ -95,9 +95,9 @@ if(hasProperty('target') && target == 'android') {
95
95
96
96
ext {
97
97
swagger_annotations_version = " 1.5.8"
98
- jackson_version = " 2.7.0 "
98
+ jackson_version = " 2.7.5 "
99
99
jersey_version = " 1.19.1"
100
- jodatime_version = " 2.9.3 "
100
+ jodatime_version = " 2.9.4 "
101
101
junit_version = " 4.12"
102
102
}
103
103
@@ -109,7 +109,7 @@ dependencies {
109
109
compile " com.fasterxml.jackson.core:jackson-annotations:$jackson_version "
110
110
compile " com.fasterxml.jackson.core:jackson-databind:$jackson_version "
111
111
compile " com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version "
112
- compile " com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5 "
112
+ compile " com.fasterxml.jackson.datatype:jackson-datatype-joda:$j ackson_version "
113
113
compile " joda-time:joda-time:$jodatime_version "
114
114
compile " com.brsanthu:migbase64:2.2"
115
115
testCompile " junit:junit:$junit_version "
Original file line number Diff line number Diff line change 146
146
<dependency >
147
147
<groupId >com.fasterxml.jackson.datatype</groupId >
148
148
<artifactId >jackson-datatype-joda</artifactId >
149
- <version >2.1.5 </version >
149
+ <version >${jackson-version} </version >
150
150
</dependency >
151
151
<dependency >
152
152
<groupId >joda-time</groupId >
173
173
<project .build.sourceEncoding>UTF-8</project .build.sourceEncoding>
174
174
<swagger-annotations-version >1.5.8</swagger-annotations-version >
175
175
<jersey-version >1.19.1</jersey-version >
176
- <jackson-version >2.7.0 </jackson-version >
177
- <jodatime-version >2.9.3 </jodatime-version >
176
+ <jackson-version >2.7.5 </jackson-version >
177
+ <jodatime-version >2.9.4 </jodatime-version >
178
178
<maven-plugin-version >1.0.0</maven-plugin-version >
179
179
<junit-version >4.12</junit-version >
180
180
</properties >
Original file line number Diff line number Diff line change @@ -75,8 +75,8 @@ public ApiClient() {
75
75
76
76
// Setup authentications (key: authentication name, value: authentication).
77
77
authentications = new HashMap <String , Authentication >();
78
- authentications .put ("api_key" , new ApiKeyAuth ("header" , "api_key" ));
79
78
authentications .put ("petstore_auth" , new OAuth ());
79
+ authentications .put ("api_key" , new ApiKeyAuth ("header" , "api_key" ));
80
80
// Prevent the authentications from being modified.
81
81
authentications = Collections .unmodifiableMap (authentications );
82
82
Original file line number Diff line number Diff line change 9
9
import io .swagger .client .Pair ;
10
10
11
11
import org .joda .time .LocalDate ;
12
- import org .joda .time .DateTime ;
13
12
import java .math .BigDecimal ;
13
+ import org .joda .time .DateTime ;
14
14
15
15
16
16
import java .util .ArrayList ;
Original file line number Diff line number Diff line change 9
9
import io .swagger .client .Pair ;
10
10
11
11
import io .swagger .client .model .Pet ;
12
- import java .io .File ;
13
12
import io .swagger .client .model .ModelApiResponse ;
13
+ import java .io .File ;
14
14
15
15
16
16
import java .util .ArrayList ;
You can’t perform that action at this time.
0 commit comments