Skip to content

Commit 581c282

Browse files
frantumafrantuma
authored
Merge pull request #9601 from swagger-api/alerts-2.0
Alerts 2.0
2 parents 7c7bc14 + 76dd313 commit 581c282

File tree

130 files changed

+2065
-2231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+2065
-2231
lines changed

‎bin/java-petstore-jersey2.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"library": "jersey2",
3+
"dateLibrary": "java8",
34
"artifactId": "swagger-petstore-jersey2"
45
}

‎pom.docker.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1071,11 +1071,11 @@
10711071
</repositories>
10721072
<properties>
10731073
<swagger-codegen-generators-version>1.0.11-SNAPSHOT</swagger-codegen-generators-version>
1074-
<swagger-core-version>2.0.8</swagger-core-version>
1075-
<swagger-core-version-v1>1.5.22</swagger-core-version-v1>
1076-
<swagger-parser-version>2.0.13</swagger-parser-version>
1077-
<swagger-parser-version-v1>1.0.45</swagger-parser-version-v1>
1078-
<jackson-version>2.9.8</jackson-version>
1074+
<swagger-core-version>2.0.9-SNAPSHOT</swagger-core-version>
1075+
<swagger-core-version-v1>1.5.23-SNAPSHOT</swagger-core-version-v1>
1076+
<swagger-parser-version>2.0.14-SNAPSHOT</swagger-parser-version>
1077+
<swagger-parser-version-v1>1.0.46-SNAPSHOT</swagger-parser-version-v1>
1078+
<jackson-version>2.9.9</jackson-version>
10791079
<scala-version>2.11.1</scala-version>
10801080
<felix-version>3.3.0</felix-version>
10811081
<commons-io-version>2.4</commons-io-version>

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,11 +1162,11 @@
11621162
</repositories>
11631163
<properties>
11641164
<swagger-codegen-generators-version>1.0.11-SNAPSHOT</swagger-codegen-generators-version>
1165-
<swagger-core-version>2.0.8</swagger-core-version>
1166-
<swagger-core-version-v1>1.5.22</swagger-core-version-v1>
1167-
<swagger-parser-version>2.0.13</swagger-parser-version>
1168-
<swagger-parser-version-v1>1.0.45</swagger-parser-version-v1>
1169-
<jackson-version>2.9.8</jackson-version>
1165+
<swagger-core-version>2.0.9-SNAPSHOT</swagger-core-version>
1166+
<swagger-core-version-v1>1.5.23-SNAPSHOT</swagger-core-version-v1>
1167+
<swagger-parser-version>2.0.14-SNAPSHOT</swagger-parser-version>
1168+
<swagger-parser-version-v1>1.0.46-SNAPSHOT</swagger-parser-version-v1>
1169+
<jackson-version>2.9.9</jackson-version>
11701170
<scala-version>2.11.1</scala-version>
11711171
<felix-version>3.3.0</felix-version>
11721172
<commons-io-version>2.4</commons-io-version>

‎pom.xml.bash‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,11 +1059,11 @@
10591059
</repositories>
10601060
<properties>
10611061
<swagger-codegen-generators-version>1.0.11-SNAPSHOT</swagger-codegen-generators-version>
1062-
<swagger-core-version>2.0.8</swagger-core-version>
1063-
<swagger-core-version-v1>1.5.22</swagger-core-version-v1>
1064-
<swagger-parser-version>2.0.13</swagger-parser-version>
1065-
<swagger-parser-version-v1>1.0.45</swagger-parser-version-v1>
1066-
<jackson-version>2.9.8</jackson-version>
1062+
<swagger-core-version>2.0.9-SNAPSHOT</swagger-core-version>
1063+
<swagger-core-version-v1>1.5.23-SNAPSHOT</swagger-core-version-v1>
1064+
<swagger-parser-version>2.0.14-SNAPSHOT</swagger-parser-version>
1065+
<swagger-parser-version-v1>1.0.46-SNAPSHOT</swagger-parser-version-v1>
1066+
<jackson-version>2.9.9</jackson-version>
10671067
<scala-version>2.11.1</scala-version>
10681068
<felix-version>3.3.0</felix-version>
10691069
<commons-io-version>2.4</commons-io-version>

‎pom.xml.shippable‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,11 +1061,11 @@
10611061
</repositories>
10621062
<properties>
10631063
<swagger-codegen-generators-version>1.0.11-SNAPSHOT</swagger-codegen-generators-version>
1064-
<swagger-core-version>2.0.8</swagger-core-version>
1065-
<swagger-core-version-v1>1.5.22</swagger-core-version-v1>
1066-
<swagger-parser-version>2.0.13</swagger-parser-version>
1067-
<swagger-parser-version-v1>1.0.45</swagger-parser-version-v1>
1068-
<jackson-version>2.9.8</jackson-version>
1064+
<swagger-core-version>2.0.9-SNAPSHOT</swagger-core-version>
1065+
<swagger-core-version-v1>1.5.23-SNAPSHOT</swagger-core-version-v1>
1066+
<swagger-parser-version>2.0.14-SNAPSHOT</swagger-parser-version>
1067+
<swagger-parser-version-v1>1.0.46-SNAPSHOT</swagger-parser-version-v1>
1068+
<jackson-version>2.9.9</jackson-version>
10691069
<scala-version>2.11.1</scala-version>
10701070
<felix-version>3.3.0</felix-version>
10711071
<commons-io-version>2.4</commons-io-version>

‎samples/client/petstore/java/feign/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.6-SNAPSHOT
1+
3.0.11-SNAPSHOT

‎samples/client/petstore/java/feign/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ if(hasProperty('target') && target == 'android') {
9595

9696
ext {
9797
swagger_annotations_version = "2.0.0"
98-
jackson_version = "2.8.7"
98+
jackson_version = "2.9.9"
9999
threepane_version = "2.6.4"
100100
feign_version = "9.4.0"
101101
feign_form_version = "2.1.0"

‎samples/client/petstore/java/feign/build.sbt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
1414
"com.netflix.feign" % "feign-jackson" % "9.4.0" % "compile",
1515
"com.netflix.feign" % "feign-slf4j" % "9.4.0" % "compile",
1616
"io.github.openfeign.form" % "feign-form" % "2.1.0" % "compile",
17-
"com.fasterxml.jackson.core" % "jackson-core" % "2.8.7" % "compile",
18-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.8.7" % "compile",
19-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.8.7" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.7" % "compile",
17+
"com.fasterxml.jackson.core" % "jackson-core" % "2.9.9" % "compile",
18+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.9.9" % "compile",
19+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.9" % "compile",
2121
"org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.2" % "compile",
2222
"com.brsanthu" % "migbase64" % "2.2" % "compile",
2323
"junit" % "junit" % "4.12" % "test",

‎samples/client/petstore/java/feign/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<swagger-core-version>2.0.0</swagger-core-version>
256256
<feign-version>9.4.0</feign-version>
257257
<feign-form-version>2.1.0</feign-form-version>
258-
<jackson-version>2.8.9</jackson-version>
258+
<jackson-version>2.9.9</jackson-version>
259259
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>
260260
<junit-version>4.12</junit-version>
261261
<maven-plugin-version>1.0.0</maven-plugin-version>

‎samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public interface AnimalApi extends ApiClient.Api {
2020
*/
2121
@RequestLine("POST /animal")
2222
@Headers({
23+
"Content-Type: application/json",
2324
"Accept: */*",
2425
})
2526
void addAnimal(Animal body);
@@ -31,6 +32,7 @@ public interface AnimalApi extends ApiClient.Api {
3132
*/
3233
@RequestLine("DELETE /animal/{animalId}")
3334
@Headers({
35+
"Content-Type: application/json",
3436
"Accept: */*",
3537
"api_key: {apiKey}"
3638
})
@@ -43,7 +45,7 @@ public interface AnimalApi extends ApiClient.Api {
4345
*/
4446
@RequestLine("GET /animal/{animalId}")
4547
@Headers({
46-
"Accept: */*",
48+
"Accept: application/json",
4749
})
4850
Animal getAnimalById(@Param("animalId") Long animalId);
4951
/**
@@ -53,6 +55,7 @@ public interface AnimalApi extends ApiClient.Api {
5355
*/
5456
@RequestLine("PUT /animal")
5557
@Headers({
58+
"Content-Type: application/json",
5659
"Accept: */*",
5760
})
5861
void updateAnimal(Animal body);
@@ -65,6 +68,7 @@ public interface AnimalApi extends ApiClient.Api {
6568
*/
6669
@RequestLine("POST /animal/{animalId}")
6770
@Headers({
71+
"Content-Type: application/x-www-form-urlencoded",
6872
"Accept: */*",
6973
})
7074
void updateAnimalWithForm(@Param("animalId") Long animalId, @Param("name") String name, @Param("status") String status);

0 commit comments

Comments
 (0)