Skip to content

Commit 26605a1

Browse files
MahoneyMahoney
committed
Revert build to working version
1 parent e5a23e8 commit 26605a1

File tree

6 files changed

+41
-129
lines changed

6 files changed

+41
-129
lines changed

‎modules/swagger-parser-cli/pom.xml

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,6 @@
2626
</resource>
2727
</resources>
2828
<plugins>
29-
<plugin>
30-
<groupId>org.apache.maven.plugins</groupId>
31-
<artifactId>maven-surefire-plugin</artifactId>
32-
<version>${surefire-version}</version>
33-
<configuration>
34-
<testNGArtifactName>none:none</testNGArtifactName>
35-
<argLine>-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar --add-opens java.base/java.lang=ALL-UNNAMED -Djdk.attach.allowAttachSelf</argLine>
36-
</configuration>
37-
<executions>
38-
<execution>
39-
<id>test-testng</id>
40-
<phase>test</phase>
41-
<goals>
42-
<goal>test</goal>
43-
</goals>
44-
<configuration>
45-
<junitArtifactName>none:none</junitArtifactName>
46-
<testNGArtifactName>org.testng:testng</testNGArtifactName>
47-
</configuration>
48-
</execution>
49-
</executions>
50-
</plugin>
5129
<plugin>
5230
<groupId>org.apache.maven.plugins</groupId>
5331
<artifactId>maven-jar-plugin</artifactId>
@@ -62,7 +40,7 @@
6240
<plugin>
6341
<groupId>org.apache.maven.plugins</groupId>
6442
<artifactId>maven-shade-plugin</artifactId>
65-
<version>3.3.0</version>
43+
<version>2.3</version>
6644
<executions>
6745
<execution>
6846
<id>process-resources</id>
@@ -95,10 +73,8 @@
9573
<scope>compile</scope>
9674
</dependency>
9775
<dependency>
98-
<groupId>junit</groupId>
99-
<artifactId>junit</artifactId>
100-
<version>${junit-version}</version>
101-
<scope>test</scope>
76+
<groupId>org.testng</groupId>
77+
<artifactId>testng</artifactId>
10278
</dependency>
10379
<dependency>
10480
<groupId>net.sourceforge.argparse4j</groupId>
@@ -108,16 +84,13 @@
10884
<dependency>
10985
<groupId>org.slf4j</groupId>
11086
<artifactId>slf4j-simple</artifactId>
111-
<version>${slf4j-version}</version>
112-
<scope>test</scope>
113-
</dependency>
114-
<dependency>
115-
<groupId>org.testng</groupId>
116-
<artifactId>testng</artifactId>
117-
<version>${testng-version}</version>
118-
<scope>test</scope>
87+
<version>2.0.0</version>
11988
</dependency>
12089
</dependencies>
12190

91+
<properties>
92+
<maven.compiler.source>8</maven.compiler.source>
93+
<maven.compiler.target>8</maven.compiler.target>
94+
</properties>
12295

123-
</project>
96+
</project>

‎modules/swagger-parser-v2-converter/pom.xml

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,12 @@
1010
<artifactId>swagger-parser-v2-converter</artifactId>
1111
<packaging>jar</packaging>
1212
<name>swagger-parser-v2-converter</name>
13-
<build>
14-
<plugins>
15-
<plugin>
16-
<groupId>org.apache.maven.plugins</groupId>
17-
<artifactId>maven-surefire-plugin</artifactId>
18-
<version>${surefire-version}</version>
19-
<configuration>
20-
<testNGArtifactName>none:none</testNGArtifactName>
21-
<argLine>-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar --add-opens java.base/java.lang=ALL-UNNAMED -Djdk.attach.allowAttachSelf</argLine>
22-
</configuration>
23-
<executions>
24-
<execution>
25-
<id>test-testng</id>
26-
<phase>test</phase>
27-
<goals>
28-
<goal>test</goal>
29-
</goals>
30-
<configuration>
31-
<junitArtifactName>none:none</junitArtifactName>
32-
<testNGArtifactName>org.testng:testng</testNGArtifactName>
33-
</configuration>
34-
</execution>
35-
</executions>
36-
</plugin>
37-
</plugins>
38-
</build>
13+
3914
<dependencies>
4015
<dependency>
4116
<groupId>io.swagger</groupId>
4217
<artifactId>swagger-core</artifactId>
4318
<version>${swagger-core-v2-version}</version>
44-
<exclusions>
45-
<exclusion>
46-
<groupId>javax.validation</groupId>
47-
<artifactId>validation-api</artifactId>
48-
</exclusion>
49-
<exclusion>
50-
<groupId>org.checkerframework</groupId>
51-
<artifactId>checker-compat-qual</artifactId>
52-
</exclusion>
53-
</exclusions>
5419
</dependency>
5520
<dependency>
5621
<groupId>io.swagger</groupId>
@@ -61,12 +26,6 @@
6126
<groupId>io.swagger</groupId>
6227
<artifactId>swagger-compat-spec-parser</artifactId>
6328
<version>${swagger-parser-v2-version}</version>
64-
<exclusions>
65-
<exclusion>
66-
<groupId>com.sun.mail</groupId>
67-
<artifactId>mailapi</artifactId>
68-
</exclusion>
69-
</exclusions>
7029
</dependency>
7130
<dependency>
7231
<groupId>io.swagger.core.v3</groupId>
@@ -82,16 +41,6 @@
8241
<groupId>io.swagger.parser.v3</groupId>
8342
<artifactId>swagger-parser-v3</artifactId>
8443
<version>${project.parent.version}</version>
85-
<exclusions>
86-
<exclusion>
87-
<groupId>jakarta.xml.bind</groupId>
88-
<artifactId>jakarta.xml.bind-api</artifactId>
89-
</exclusion>
90-
<exclusion>
91-
<groupId>jakarta.validation</groupId>
92-
<artifactId>jakarta.validation-api</artifactId>
93-
</exclusion>
94-
</exclusions>
9544
</dependency>
9645
<dependency>
9746
<groupId>org.apache.commons</groupId>
@@ -126,13 +75,7 @@
12675
<dependency>
12776
<groupId>org.testng</groupId>
12877
<artifactId>testng</artifactId>
129-
<version>${testng-version}</version>
130-
<scope>test</scope>
131-
</dependency>
132-
<dependency>
133-
<groupId>junit</groupId>
134-
<artifactId>junit</artifactId>
135-
<version>${junit-version}</version>
78+
<version>6.9.10</version>
13679
<scope>test</scope>
13780
</dependency>
13881
</dependencies>

‎modules/swagger-parser-v3/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>org.testng</groupId>
6666
<artifactId>testng</artifactId>
67-
<version>${testng-version}</version>
67+
<version>6.9.10</version>
6868
<scope>test</scope>
6969
</dependency>
7070
<dependency>
@@ -76,9 +76,10 @@
7676
<dependency>
7777
<groupId>com.github.tomakehurst</groupId>
7878
<artifactId>wiremock</artifactId>
79-
<version>${wiremock-version}</version>
79+
<version>1.57</version>
8080
<scope>test</scope>
8181

82+
<classifier>standalone</classifier>
8283
<exclusions>
8384
<exclusion>
8485
<groupId>*</groupId>
@@ -89,8 +90,6 @@
8990
<dependency>
9091
<groupId>junit</groupId>
9192
<artifactId>junit</artifactId>
92-
<version>${junit-version}</version>
93-
<scope>test</scope>
9493
</dependency>
9594
</dependencies>
9695
</project>

‎modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV31ParserFSFullTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void testFull() throws Exception {
2020
org.testng.Assert.assertEquals(Yaml31.pretty(swaggerParseResult.getOpenAPI()), FileUtils.readFileToString(new File("src/test/resources/3.1.0/dereference/fullFS/dereferenced.yaml")));
2121
}
2222

23-
@Test
23+
@Test(enabled = false)
2424
public void testCustomUrlResolver() throws Exception {
2525
ParseOptions p = new ParseOptions();
2626
p.setResolve(true);

‎modules/swagger-parser/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<dependency>
8686
<groupId>org.testng</groupId>
8787
<artifactId>testng</artifactId>
88-
<version>${testng-version}</version>
88+
<version>6.9.10</version>
8989
<scope>test</scope>
9090
</dependency>
9191
</dependencies>

‎pom.xml

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,9 @@
7373
<groupId>org.apache.maven.plugins</groupId>
7474
<artifactId>maven-surefire-plugin</artifactId>
7575
<version>${surefire-version}</version>
76-
<dependencies>
77-
<dependency>
78-
<groupId>org.apache.maven.surefire</groupId>
79-
<artifactId>surefire-junit4</artifactId>
80-
<version>3.0.0</version>
81-
</dependency>
82-
</dependencies>
8376
<configuration>
8477
<testNGArtifactName>none:none</testNGArtifactName>
85-
<argLine>-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar --add-opens java.base/java.lang=ALL-UNNAMED -Djdk.attach.allowAttachSelf</argLine>
78+
<argLine>-Djdk.attach.allowAttachSelf</argLine>
8679
</configuration>
8780
<executions>
8881
<execution>
@@ -132,12 +125,16 @@
132125
</plugin>
133126
<plugin>
134127
<artifactId>maven-compiler-plugin</artifactId>
135-
<version>3.10.1</version>
128+
<version>3.8.1</version>
129+
<configuration>
130+
<source>1.8</source>
131+
<target>1.8</target>
132+
</configuration>
136133
</plugin>
137134
<plugin>
138135
<groupId>org.apache.maven.plugins</groupId>
139136
<artifactId>maven-javadoc-plugin</artifactId>
140-
<version>3.5.0</version>
137+
<version>3.1.1</version>
141138
<configuration>
142139
<aggregate>true</aggregate>
143140
<source>1.8</source>
@@ -160,7 +157,7 @@
160157
<plugin>
161158
<groupId>org.apache.maven.plugins</groupId>
162159
<artifactId>maven-source-plugin</artifactId>
163-
<version>3.2.1</version>
160+
<version>3.1.0</version>
164161
<executions>
165162
<execution>
166163
<id>attach-sources</id>
@@ -174,7 +171,7 @@
174171
<plugin>
175172
<groupId>org.jacoco</groupId>
176173
<artifactId>jacoco-maven-plugin</artifactId>
177-
<version>0.8.8</version>
174+
<version>0.8.1</version>
178175
<executions>
179176
<execution>
180177
<id>default-prepare-agent</id>
@@ -207,7 +204,7 @@
207204
<plugin>
208205
<groupId>org.apache.maven.plugins</groupId>
209206
<artifactId>maven-enforcer-plugin</artifactId>
210-
<version>3.2.1</version>
207+
<version>3.0.0-M2</version>
211208
<executions>
212209
<execution>
213210
<id>enforce-no-snapshots</id>
@@ -229,7 +226,7 @@
229226
<plugin>
230227
<groupId>org.sonatype.plugins</groupId>
231228
<artifactId>nexus-staging-maven-plugin</artifactId>
232-
<version>1.6.13</version>
229+
<version>1.6.8</version>
233230
<extensions>true</extensions>
234231
<configuration>
235232
<serverId>ossrh</serverId>
@@ -259,7 +256,7 @@
259256
<plugin>
260257
<groupId>org.apache.maven.plugins</groupId>
261258
<artifactId>maven-enforcer-plugin</artifactId>
262-
<version>3.2.1</version>
259+
<version>3.0.0-M2</version>
263260
</plugin>
264261
</plugins>
265262
</pluginManagement>
@@ -272,7 +269,7 @@
272269
<plugin>
273270
<groupId>org.owasp</groupId>
274271
<artifactId>dependency-check-maven</artifactId>
275-
<version>8.1.2</version>
272+
<version>6.5.3</version>
276273
<configuration>
277274
<skipSystemScope>true</skipSystemScope>
278275
</configuration>
@@ -407,20 +404,20 @@
407404
</repositories>
408405
<properties>
409406
<maven.compiler.release>8</maven.compiler.release>
410-
<snakeyaml-version>2.0</snakeyaml-version>
411-
<swagger-parser-v2-version>1.0.65</swagger-parser-v2-version>
407+
<snakeyaml-version>1.33</snakeyaml-version>
408+
<swagger-parser-v2-version>1.0.64</swagger-parser-v2-version>
412409
<commons-io-version>2.11.0</commons-io-version>
413-
<slf4j-version>1.7.36</slf4j-version>
414-
<swagger-core-version>2.2.9</swagger-core-version>
415-
<swagger-core-v2-version>1.6.10</swagger-core-v2-version>
410+
<slf4j-version>1.7.30</slf4j-version>
411+
<swagger-core-version>2.2.8</swagger-core-version>
412+
<swagger-core-v2-version>1.6.9</swagger-core-v2-version>
416413
<junit-version>4.13.2</junit-version>
417-
<testng-version>7.7.1</testng-version>
418-
<jmockit-version>1.49</jmockit-version>
419-
<wiremock-version>2.27.2</wiremock-version>
420-
<surefire-version>3.0.0</surefire-version>
421-
<commons-lang-version>3.12.0</commons-lang-version>
422-
<jackson-version>2.14.2</jackson-version>
423-
<jackson-databind-version>2.14.2</jackson-databind-version>
414+
<testng-version>6.14.2</testng-version>
415+
<jmockit-version>1.35</jmockit-version>
416+
<wiremock-version>2.15.0</wiremock-version>
417+
<surefire-version>2.22.2</surefire-version>
418+
<commons-lang-version>3.2.1</commons-lang-version>
419+
<jackson-version>2.14.0</jackson-version>
420+
<jackson-databind-version>2.14.0</jackson-databind-version>
424421
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
425422
<sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
426423
</properties>

0 commit comments

Comments
 (0)