From 345ee25409452aa301bbf4095267c60c41df8612 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Mon, 26 Mar 2018 12:13:45 +0200 Subject: [PATCH 1/3] Use version 2.0.0-SNAPSHOT of swagger-parser-v3 --- pom.xml | 444 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 222 insertions(+), 222 deletions(-) diff --git a/pom.xml b/pom.xml index 8c3c996ee..a65adb75d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,222 +1,222 @@ - - 4.0.0 - - - org.sonatype.oss - oss-parent - 7 - - - com.qdesrame - openapi-diff - 1.1.2-SNAPSHOT - jar - - openapi-diff - Utility for comparing two OpenAPI specifications. - http://maven.apache.org - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - qdesrame - quen2404@gmail.com - - - - - scm:git:http://github.com/quen2404/openapi-diff.git - scm:git:http://github.com/quen2404/openapi-diff.git - https://github.com/quen2404/openapi-diff - HEAD - - - - - sonatype-nexus-snapshots - Sonatype Nexus snapshot repository - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - Sonatype Nexus release repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - UTF-8 - github - - - - - io.swagger.parser.v3 - swagger-parser-v3 - 2.0.0-rc3 - - - com.j2html - j2html - 1.2.0 - - - com.alibaba - fastjson - 1.2.7 - - - junit - junit - 4.8.2 - test - - - org.apache.commons - commons-collections4 - 4.0 - - - commons-cli - commons-cli - 1.4 - - - org.slf4j - slf4j-api - 1.7.25 - - - org.slf4j - slf4j-log4j12 - 1.7.25 - - - commons-httpclient - commons-httpclient - 3.1 - - - org.projectlombok - lombok - 1.16.18 - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - - --pinentry-mode - loopback - - - - - - sign-artifacts - verify - - sign - - - - - - - - - - - - maven-compiler-plugin - - 1.8 - 1.8 - UTF-8 - - 3.2 - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - package - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - - @{project.version} - true - releases - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - true - true - true - true - true - - - - attach-javadocs - - jar - - - - - - maven-assembly-plugin - - - - com.qdesrame.openapi.diff.Main - - - - jar-with-dependencies - - - - - - + + 4.0.0 + + + org.sonatype.oss + oss-parent + 7 + + + com.qdesrame + openapi-diff + 1.1.2-SNAPSHOT + jar + + openapi-diff + Utility for comparing two OpenAPI specifications. + http://maven.apache.org + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + qdesrame + quen2404@gmail.com + + + + + scm:git:http://github.com/quen2404/openapi-diff.git + scm:git:http://github.com/quen2404/openapi-diff.git + https://github.com/quen2404/openapi-diff + HEAD + + + + + sonatype-nexus-snapshots + Sonatype Nexus snapshot repository + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + Sonatype Nexus release repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + UTF-8 + github + + + + + io.swagger.parser.v3 + swagger-parser-v3 + 2.0.0-SNAPSHOT + + + com.j2html + j2html + 1.2.0 + + + com.alibaba + fastjson + 1.2.7 + + + junit + junit + 4.8.2 + test + + + org.apache.commons + commons-collections4 + 4.0 + + + commons-cli + commons-cli + 1.4 + + + org.slf4j + slf4j-api + 1.7.25 + + + org.slf4j + slf4j-log4j12 + 1.7.25 + + + commons-httpclient + commons-httpclient + 3.1 + + + org.projectlombok + lombok + 1.16.18 + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + + --pinentry-mode + loopback + + + + + + sign-artifacts + verify + + sign + + + + + + + + + + + + maven-compiler-plugin + + 1.8 + 1.8 + UTF-8 + + 3.2 + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + + @{project.version} + true + releases + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + true + true + true + true + true + + + + attach-javadocs + + jar + + + + + + maven-assembly-plugin + + + + com.qdesrame.openapi.diff.Main + + + + jar-with-dependencies + + + + + + From bf94811672924653a5394ae9657d7f1ddd482160 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Mon, 26 Mar 2018 12:22:24 +0200 Subject: [PATCH 2/3] Handle removal of "allowEmptyValue" in "Header" --- .../java/com/qdesrame/openapi/diff/compare/HeaderDiff.java | 1 - .../java/com/qdesrame/openapi/diff/model/ChangedHeader.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/HeaderDiff.java b/src/main/java/com/qdesrame/openapi/diff/compare/HeaderDiff.java index 3aea95ff9..f15badf47 100644 --- a/src/main/java/com/qdesrame/openapi/diff/compare/HeaderDiff.java +++ b/src/main/java/com/qdesrame/openapi/diff/compare/HeaderDiff.java @@ -39,7 +39,6 @@ protected Optional computeDiff(HashSet refSet, Header lef changedHeader.setChangeDescription(!Objects.equals(left.getDescription(), right.getDescription())); changedHeader.setChangeRequired(getBooleanDiff(left.getRequired(), right.getRequired())); changedHeader.setChangeDeprecated(!Boolean.TRUE.equals(left.getDeprecated()) && Boolean.TRUE.equals(right.getDeprecated())); - changedHeader.setChangeAllowEmptyValue(getBooleanDiff(left.getAllowEmptyValue(), right.getAllowEmptyValue())); changedHeader.setChangeStyle(!Objects.equals(left.getStyle(), right.getStyle())); changedHeader.setChangeExplode(getBooleanDiff(left.getExplode(), right.getExplode())); openApiDiff.getSchemaDiff().diff(new HashSet<>(), left.getSchema(), right.getSchema()).ifPresent(changedHeader::setChangedSchema); diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedHeader.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedHeader.java index a79af7800..a8d1124d7 100644 --- a/src/main/java/com/qdesrame/openapi/diff/model/ChangedHeader.java +++ b/src/main/java/com/qdesrame/openapi/diff/model/ChangedHeader.java @@ -16,7 +16,6 @@ public class ChangedHeader implements Changed { private boolean changeDescription; private boolean changeRequired; private boolean changeDeprecated; - private boolean changeAllowEmptyValue; private boolean changeStyle; private boolean changeExplode; private ChangedSchema changedSchema; @@ -32,7 +31,6 @@ public boolean isDiff() { return changeDescription || changeRequired || changeDeprecated - || changeAllowEmptyValue || changeStyle || changeExplode || (changedSchema != null && changedSchema.isDiff()) @@ -42,7 +40,6 @@ public boolean isDiff() { @Override public boolean isDiffBackwardCompatible() { return changeRequired - && changeAllowEmptyValue && changeStyle && changeExplode && (changedSchema == null || changedSchema.isDiffBackwardCompatible(false)) From 2e773fd03932fc4292bcfa5fd8a4b72443bc5b68 Mon Sep 17 00:00:00 2001 From: Quentin Desrame Date: Tue, 17 Apr 2018 22:18:52 +0200 Subject: [PATCH 3/3] Upgrade swagger-parser to stable release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a65adb75d..a307e6c78 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ io.swagger.parser.v3 swagger-parser-v3 - 2.0.0-SNAPSHOT + 2.0.0 com.j2html