diff --git a/.gitignore b/.gitignore index b430fb64..ce43916f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,13 @@ *.class hs_err_pid* target/ -dependency-reduced-pom.xml -.settings -.project -.classpath \ No newline at end of file +dependency-reduced-pom.xml +.settings +.project +.classpath +*.pyc +/bin/ +*.ipr +*.iws +.DS_Store +**/test-output/* diff --git a/CI/post-release.sh b/CI/post-release.sh index d9b55496..9f7adda1 100755 --- a/CI/post-release.sh +++ b/CI/post-release.sh @@ -15,3 +15,15 @@ python $CUR/CI/publishRelease.py "$SC_RELEASE_TAG" ##################### mvn versions:set -DnewVersion="${SC_NEXT_VERSION}-SNAPSHOT" mvn versions:commit + +##################### +### update all other versions in files around to the new release, including readme ### +##################### +sc_find="$SC_VERSION" +sc_replace="${SC_NEXT_VERSION}-SNAPSHOT" +sed -i -e "s/$sc_find/$sc_replace/g" $CUR/README.md + +sc_find="$SC_VERSION<\/version>" +sc_replace="${SC_NEXT_VERSION}-SNAPSHOT<\/version>" +sed -i -e "s/$sc_find/$sc_replace/g" $CUR/scripts/pom.xml + diff --git a/README.md b/README.md index 43159ea0..e526a9e9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Swagger Inflector -[![Build Status](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-inflector-master)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-inflector-master) - [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-inflector/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/io.swagger/swagger-inflector) ---- diff --git a/pom.xml b/pom.xml index d2fe0817..b38af75b 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.4.1 enforce-versions @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-source-plugin - 2.1.2 + 3.3.0 attach-sources @@ -168,7 +168,7 @@ maven-compiler-plugin - 3.8.1 + 3.11.0 1.8 1.8 @@ -195,12 +195,12 @@ org.apache.maven.plugins maven-site-plugin - 2.1 + 3.12.1 org.apache.maven.plugins maven-release-plugin - 2.1 + 2.5.3 org.apache.maven.plugins @@ -494,6 +494,11 @@ jackson-jaxrs-json-provider ${jackson.version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + com.fasterxml.jackson.jaxrs jackson-jaxrs-yaml-provider @@ -554,19 +559,19 @@ - 3.0.1 - 2.2.17 - 2.1.18 - 2.15.3 + 3.6.2 + 2.2.21 + 2.1.22 + 2.17.0 9.4.53.v20231009 - 2.40 + 2.42 3.1.0 - 2.14.0 - 3.13.0 + 2.16.0 + 3.14.0 1.10.0 2.2.14 - 1.4.11 + 1.5.3 4.13.2 1.7.36 1.19 diff --git a/scripts/pom.xml b/scripts/pom.xml index b35bbdb7..2f0df92b 100644 --- a/scripts/pom.xml +++ b/scripts/pom.xml @@ -169,7 +169,7 @@ io.swagger swagger-inflector - 2.0.10 + 2.0.12-SNAPSHOT diff --git a/src/main/java/io/swagger/oas/inflector/config/DirectionDeserializer.java b/src/main/java/io/swagger/oas/inflector/config/DirectionDeserializer.java index 3716b0ba..1081f14a 100644 --- a/src/main/java/io/swagger/oas/inflector/config/DirectionDeserializer.java +++ b/src/main/java/io/swagger/oas/inflector/config/DirectionDeserializer.java @@ -20,6 +20,7 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.exc.InvalidDefinitionException; import java.io.IOException; import java.util.EnumSet; @@ -49,6 +50,6 @@ public Set deserialize(JsonParser jp, } } } - throw ctxt.mappingException(Configuration.Direction.class); + throw InvalidDefinitionException.from(jp, String.format("Failed to deserialize %s", jp.getText()), ctxt.constructType(Configuration.Direction.class)); } }