Skip to content

Commit c4dfd9d

Browse files
frantumafrantuma
committed
update deps, java, version
1 parent b80d1ce commit c4dfd9d

File tree

6 files changed

+221
-214
lines changed

6 files changed

+221
-214
lines changed

‎.github/workflows/maven.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: Deployment
22
on:
3-
push:
4-
branches:
5-
- master
3+
workflow_dispatch:
4+
branches:
5+
- master
66
jobs:
77
build:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
java: [ 8 ]
11+
java: [ 11 ]
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Set up Java

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ There is an online version hosted on http://validator.swagger.io.
1111
You can also pull a docker image of the validator directly from [DockerHub](https://hub.docker.com/r/swaggerapi/swagger-validator-v2/), e.g.:
1212

1313
```
14-
docker pull swaggerapi/swagger-validator-v2:v2.1.0
15-
docker run -it -p 8080:8080 --name swagger-validator-v2 swaggerapi/swagger-validator-v2:v2.1.0
14+
docker pull swaggerapi/swagger-validator-v2:v2.1.3
15+
docker run -it -p 8080:8080 --name swagger-validator-v2 swaggerapi/swagger-validator-v2:v2.1.3
1616
```
1717

1818
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:
1919

2020
```
21-
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
21+
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
2222
```
2323

2424
In non docker environments, system properties `rejectLocal` and `rejectRedirect` can be used.

‎pom.xml

Lines changed: 74 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<artifactId>swagger-validator</artifactId>
1010
<packaging>war</packaging>
1111
<name>swagger-validator</name>
12-
<version>2.1.2</version>
12+
<version>2.1.3</version>
1313
<prerequisites>
1414
<maven>2.2.0</maven>
1515
</prerequisites>
@@ -35,26 +35,14 @@
3535
<developerConnection>scm:git:ssh://github.com:swagger-api/validator-badge.git</developerConnection>
3636
<url>http://github.com/HugoMario/validator-badge/tree/main</url>
3737
</scm>
38-
<developers>
39-
<developer>
40-
<id>fehguy</id>
41-
<name>Tony Tam</name>
42-
<email>fehguy@gmail.com</email>
43-
</developer>
44-
</developers>
45-
4638
<build>
4739
<defaultGoal>install</defaultGoal>
4840
<directory>target</directory>
4941
<finalName>${project.artifactId}-${project.version}</finalName>
5042
<plugins>
5143
<plugin>
5244
<artifactId>maven-compiler-plugin</artifactId>
53-
<version>3.5</version>
54-
<configuration>
55-
<source>1.8</source>
56-
<target>1.8</target>
57-
</configuration>
45+
<version>3.10.1</version>
5846
</plugin>
5947
<plugin>
6048
<groupId>org.codehaus.mojo</groupId>
@@ -78,27 +66,7 @@
7866
<plugin>
7967
<groupId>org.apache.maven.plugins</groupId>
8068
<artifactId>maven-surefire-plugin</artifactId>
81-
<version>${surefire-version}</version>
82-
<configuration>
83-
<testNGArtifactName>none:none</testNGArtifactName>
84-
<systemPropertyVariables>
85-
<rejectLocal>false</rejectLocal>
86-
<rejectRedirect>false</rejectRedirect>
87-
</systemPropertyVariables>
88-
</configuration>
89-
<executions>
90-
<execution>
91-
<id>test-testng</id>
92-
<phase>test</phase>
93-
<goals>
94-
<goal>test</goal>
95-
</goals>
96-
<configuration>
97-
<junitArtifactName>none:none</junitArtifactName>
98-
<testNGArtifactName>org.testng:testng</testNGArtifactName>
99-
</configuration>
100-
</execution>
101-
</executions>
69+
<version>3.1.2</version>
10270
</plugin>
10371
<plugin>
10472
<artifactId>maven-dependency-plugin</artifactId>
@@ -232,32 +200,39 @@
232200
</execution>
233201
</executions>
234202
</plugin>
235-
<plugin>
236-
<groupId>org.apache.maven.plugins</groupId>
237-
<artifactId>maven-javadoc-plugin</artifactId>
238-
<version>2.9.1</version>
239-
<executions>
240-
<execution>
241-
<id>attach-javadocs</id>
242-
<goals>
243-
<goal>jar</goal>
244-
</goals>
245-
</execution>
246-
</executions>
247-
</plugin>
248203
</plugins>
249204
</build>
250205
<dependencies>
251206
<dependency>
252207
<groupId>io.swagger.parser.v3</groupId>
253208
<artifactId>swagger-parser</artifactId>
254209
<version>${swagger-parser-version}</version>
210+
<exclusions>
211+
<exclusion>
212+
<groupId>org.slf4j</groupId>
213+
<artifactId>slf4j-api</artifactId>
214+
</exclusion>
215+
</exclusions>
255216
</dependency>
256217
<!-- inflector library -->
257218
<dependency>
258219
<groupId>io.swagger</groupId>
259220
<artifactId>swagger-inflector</artifactId>
260221
<version>${swagger-inflector-version}</version>
222+
<exclusions>
223+
<exclusion>
224+
<groupId>org.slf4j</groupId>
225+
<artifactId>slf4j-ext</artifactId>
226+
</exclusion>
227+
<exclusion>
228+
<groupId>org.slf4j</groupId>
229+
<artifactId>slf4j-api</artifactId>
230+
</exclusion>
231+
<exclusion>
232+
<groupId>ch.qos.logback</groupId>
233+
<artifactId>logback-classic</artifactId>
234+
</exclusion>
235+
</exclusions>
261236
</dependency>
262237

263238
<dependency>
@@ -269,7 +244,13 @@
269244
<dependency>
270245
<groupId>com.networknt</groupId>
271246
<artifactId>json-schema-validator</artifactId>
272-
<version>1.0.73</version>
247+
<version>${nt-json-schema-validator-version}</version>
248+
<exclusions>
249+
<exclusion>
250+
<groupId>org.slf4j</groupId>
251+
<artifactId>slf4j-api</artifactId>
252+
</exclusion>
253+
</exclusions>
273254
</dependency>
274255

275256
<dependency>
@@ -308,26 +289,46 @@
308289
<version>${httpclient-version}</version>
309290
</dependency>
310291
<dependency>
311-
<groupId>org.testng</groupId>
312-
<artifactId>testng</artifactId>
313-
<version>${testng-version}</version>
292+
<groupId>junit</groupId>
293+
<artifactId>junit</artifactId>
294+
<version>${junit-version}</version>
295+
<scope>test</scope>
296+
<exclusions>
297+
<exclusion>
298+
<groupId>org.slf4j</groupId>
299+
<artifactId>slf4j-api</artifactId>
300+
</exclusion>
301+
</exclusions>
302+
</dependency>
303+
<dependency>
304+
<groupId>org.assertj</groupId>
305+
<artifactId>assertj-core</artifactId>
306+
<version>${assertj-version}</version>
314307
<scope>test</scope>
315308
</dependency>
316309
<dependency>
317-
<groupId>com.github.tomakehurst</groupId>
310+
<groupId>org.wiremock</groupId>
318311
<artifactId>wiremock</artifactId>
319-
<version>1.57</version>
312+
<version>${wiremock-version}</version>
320313
<scope>test</scope>
321-
322-
<classifier>standalone</classifier>
323314
<exclusions>
324315
<exclusion>
325-
<groupId>*</groupId>
326-
<artifactId>*</artifactId>
316+
<groupId>org.slf4j</groupId>
317+
<artifactId>slf4j-api</artifactId>
327318
</exclusion>
328319
</exclusions>
329320
</dependency>
330-
321+
<dependency>
322+
<groupId>ch.qos.logback</groupId>
323+
<artifactId>logback-classic</artifactId>
324+
<version>${logback-version}</version>
325+
<scope>test</scope>
326+
</dependency>
327+
<dependency>
328+
<groupId>org.slf4j</groupId>
329+
<artifactId>slf4j-api</artifactId>
330+
<version>${slf4j-version}</version>
331+
</dependency>
331332
</dependencies>
332333
<repositories>
333334
<repository>
@@ -339,18 +340,22 @@
339340
</repository>
340341
</repositories>
341342
<properties>
342-
<testng-version>6.9.6</testng-version>
343-
<jackson.version>2.13.4</jackson.version>
344-
<jackson-databind.version>2.13.4.2</jackson-databind.version>
345-
<snakeyaml.version>1.33</snakeyaml.version>
343+
<maven.compiler.release>8</maven.compiler.release>
344+
<jackson.version>2.15.3</jackson.version>
345+
<jackson-databind.version>2.15.3</jackson-databind.version>
346+
<snakeyaml.version>2.2</snakeyaml.version>
346347
<httpclient-version>4.5.13</httpclient-version>
347348
<maven-plugin-version>1.0.0</maven-plugin-version>
348-
<swagger-parser-version>2.1.7</swagger-parser-version>
349-
<swagger-inflector-version>2.0.8</swagger-inflector-version>
350-
<jetty-version>9.4.18.v20190429</jetty-version>
351-
<logback-version>1.2.10</logback-version>
352-
<slf4j-version>1.7.36</slf4j-version>
353-
<surefire-version>2.18.1</surefire-version>
349+
<swagger-parser-version>2.1.18</swagger-parser-version>
350+
<swagger-inflector-version>2.0.10</swagger-inflector-version>
351+
<jetty-version>9.4.53.v20231009</jetty-version>
352+
<logback-version>1.4.11</logback-version>
353+
<slf4j-version>2.0.9</slf4j-version>
354+
<surefire-version>3.1.2</surefire-version>
355+
<wiremock-version>3.2.0</wiremock-version>
356+
<junit-version>4.13</junit-version>
357+
<assertj-version>3.24.2</assertj-version>
354358
<json-schema-validator-version>2.2.14</json-schema-validator-version>
359+
<nt-json-schema-validator-version>1.0.73</nt-json-schema-validator-version>
355360
</properties>
356361
</project>

‎src/main/swagger/swagger.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ openapi: 3.0.0
33
info:
44
title: Swagger Validator Badge
55
description: Parses and validates a Swagger/OpenAPI 2.0 or an OpenAPI 3.x definition
6-
version: 2.1.2
6+
version: 2.1.3
77
servers:
88
- url: "/"
99
paths:

0 commit comments

Comments
 (0)