Skip to content

update deps, java, version #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2023
Merged

update deps, java, version #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Deployment
on:
push:
branches:
- master
workflow_dispatch:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8 ]
java: [ 11 ]
steps:
- uses: actions/checkout@v2
- name: Set up Java
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ There is an online version hosted on http://validator.swagger.io.
You can also pull a docker image of the validator directly from [DockerHub](https://hub.docker.com/r/swaggerapi/swagger-validator-v2/), e.g.:

```
docker pull swaggerapi/swagger-validator-v2:v2.1.0
docker run -it -p 8080:8080 --name swagger-validator-v2 swaggerapi/swagger-validator-v2:v2.1.0
docker pull swaggerapi/swagger-validator-v2:v2.1.3
docker run -it -p 8080:8080 --name swagger-validator-v2 swaggerapi/swagger-validator-v2:v2.1.3
```

Since version `2.0.2` local and non http/https urls are rejected by default, along with redirects; this is controllable with docker env variables / java system properties:

```
docker run -it -p 8080:8080 -e "REJECT_LOCAL=false" -e "REJECT_REDIRECT=false" --name swagger-validator-v2 swaggerapi/swagger-validator-v2:v2.1.0
docker run -it -p 8080:8080 -e "REJECT_LOCAL=false" -e "REJECT_REDIRECT=false" --name swagger-validator-v2 swaggerapi/swagger-validator-v2:v2.1.3
```

In non docker environments, system properties `rejectLocal` and `rejectRedirect` can be used.
Expand Down
143 changes: 74 additions & 69 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<artifactId>swagger-validator</artifactId>
<packaging>war</packaging>
<name>swagger-validator</name>
<version>2.1.2</version>
<version>2.1.3</version>
<prerequisites>
<maven>2.2.0</maven>
</prerequisites>
Expand All @@ -35,26 +35,14 @@
<developerConnection>scm:git:ssh://github.com:swagger-api/validator-badge.git</developerConnection>
<url>http://github.com/HugoMario/validator-badge/tree/main</url>
</scm>
<developers>
<developer>
<id>fehguy</id>
<name>Tony Tam</name>
<email>fehguy@gmail.com</email>
</developer>
</developers>

<build>
<defaultGoal>install</defaultGoal>
<directory>target</directory>
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
<version>3.10.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -78,27 +66,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-version}</version>
<configuration>
<testNGArtifactName>none:none</testNGArtifactName>
<systemPropertyVariables>
<rejectLocal>false</rejectLocal>
<rejectRedirect>false</rejectRedirect>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<id>test-testng</id>
<phase>test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<junitArtifactName>none:none</junitArtifactName>
<testNGArtifactName>org.testng:testng</testNGArtifactName>
</configuration>
</execution>
</executions>
<version>3.1.2</version>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
Expand Down Expand Up @@ -232,32 +200,39 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.swagger.parser.v3</groupId>
<artifactId>swagger-parser</artifactId>
<version>${swagger-parser-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- inflector library -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-inflector</artifactId>
<version>${swagger-inflector-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -269,7 +244,13 @@
<dependency>
<groupId>com.networknt</groupId>
<artifactId>json-schema-validator</artifactId>
<version>1.0.73</version>
<version>${nt-json-schema-validator-version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -308,26 +289,46 @@
<version>${httpclient-version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng-version}</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit-version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<version>1.57</version>
<version>${wiremock-version}</version>
<scope>test</scope>

<classifier>standalone</classifier>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-version}</version>
</dependency>
</dependencies>
<repositories>
<repository>
Expand All @@ -339,18 +340,22 @@
</repository>
</repositories>
<properties>
<testng-version>6.9.6</testng-version>
<jackson.version>2.13.4</jackson.version>
<jackson-databind.version>2.13.4.2</jackson-databind.version>
<snakeyaml.version>1.33</snakeyaml.version>
<maven.compiler.release>8</maven.compiler.release>
<jackson.version>2.15.3</jackson.version>
<jackson-databind.version>2.15.3</jackson-databind.version>
<snakeyaml.version>2.2</snakeyaml.version>
<httpclient-version>4.5.13</httpclient-version>
<maven-plugin-version>1.0.0</maven-plugin-version>
<swagger-parser-version>2.1.7</swagger-parser-version>
<swagger-inflector-version>2.0.8</swagger-inflector-version>
<jetty-version>9.4.18.v20190429</jetty-version>
<logback-version>1.2.10</logback-version>
<slf4j-version>1.7.36</slf4j-version>
<surefire-version>2.18.1</surefire-version>
<swagger-parser-version>2.1.18</swagger-parser-version>
<swagger-inflector-version>2.0.10</swagger-inflector-version>
<jetty-version>9.4.53.v20231009</jetty-version>
<logback-version>1.4.11</logback-version>
<slf4j-version>2.0.9</slf4j-version>
<surefire-version>3.1.2</surefire-version>
<wiremock-version>3.2.0</wiremock-version>
<junit-version>4.13</junit-version>
<assertj-version>3.24.2</assertj-version>
<json-schema-validator-version>2.2.14</json-schema-validator-version>
<nt-json-schema-validator-version>1.0.73</nt-json-schema-validator-version>
</properties>
</project>
2 changes: 1 addition & 1 deletion src/main/swagger/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ openapi: 3.0.0
info:
title: Swagger Validator Badge
description: Parses and validates a Swagger/OpenAPI 2.0 or an OpenAPI 3.x definition
version: 2.1.2
version: 2.1.3
servers:
- url: "/"
paths:
Expand Down
Loading