Skip to content

Commit 7d2feca

Browse files
lucebaclucebac
committed
more dependency upgrades; tests working again
1 parent 79b3283 commit 7d2feca

File tree

8 files changed

+39
-22
lines changed

8 files changed

+39
-22
lines changed

‎Attacks/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<plugins>
2121
<plugin>
2222
<artifactId>maven-clean-plugin</artifactId>
23-
<version>3.0.0</version>
23+
<version>3.1.0</version>
2424
<configuration>
2525
<filesets>
2626
<fileset>
@@ -44,7 +44,7 @@
4444
<!-- Build an executable JAR -->
4545
<groupId>org.apache.maven.plugins</groupId>
4646
<artifactId>maven-jar-plugin</artifactId>
47-
<version>2.6</version>
47+
<version>3.2.0</version>
4848
<configuration>
4949
<archive>
5050
<manifest>

‎TLS-Client/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- Build an executable JAR -->
1717
<groupId>org.apache.maven.plugins</groupId>
1818
<artifactId>maven-jar-plugin</artifactId>
19-
<version>2.6</version>
19+
<version>3.2.0</version>
2020
<configuration>
2121
<archive>
2222
<manifest>
@@ -29,7 +29,7 @@
2929
</plugin>
3030
<plugin>
3131
<artifactId>maven-clean-plugin</artifactId>
32-
<version>3.0.0</version>
32+
<version>3.1.0</version>
3333
<configuration>
3434
<filesets>
3535
<fileset>

‎TLS-Core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
</plugins>
8787
</reporting>
8888
<properties>
89-
<maven.compiler.source>1.7</maven.compiler.source>
90-
<maven.compiler.target>1.7</maven.compiler.target>
89+
<maven.compiler.source>1.8</maven.compiler.source>
90+
<maven.compiler.target>1.8</maven.compiler.target>
9191
<main.basedir>${project.parent.basedir}</main.basedir>
9292
</properties>
9393
</project>

‎TLS-Forensics/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Build an executable JAR -->
1616
<groupId>org.apache.maven.plugins</groupId>
1717
<artifactId>maven-jar-plugin</artifactId>
18-
<version>2.6</version>
18+
<version>3.2.0</version>
1919
<configuration>
2020
<archive>
2121
<manifest>

‎TLS-Mitm/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Build an executable JAR -->
1616
<groupId>org.apache.maven.plugins</groupId>
1717
<artifactId>maven-jar-plugin</artifactId>
18-
<version>2.6</version>
18+
<version>3.2.0</version>
1919
<configuration>
2020
<archive>
2121
<manifest>

‎TLS-Server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Build an executable JAR -->
1616
<groupId>org.apache.maven.plugins</groupId>
1717
<artifactId>maven-jar-plugin</artifactId>
18-
<version>2.6</version>
18+
<version>3.2.0</version>
1919
<configuration>
2020
<archive>
2121
<manifest>

‎Utils/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</plugins>
2222
</build>
2323
<properties>
24-
<maven.compiler.source>1.7</maven.compiler.source>
25-
<maven.compiler.target>1.7</maven.compiler.target>
24+
<maven.compiler.source>1.8</maven.compiler.source>
25+
<maven.compiler.target>1.8</maven.compiler.target>
2626
<main.basedir>${project.parent.basedir}</main.basedir>
2727
</properties>
28-
</project>
28+
</project>

‎pom.xml‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,17 @@
9999
<groupId>junit</groupId>
100100
<artifactId>junit</artifactId>
101101
<version>4.13</version>
102+
<scope>test</scope>
102103
</dependency>
103104
<dependency>
104105
<groupId>org.bouncycastle</groupId>
105106
<artifactId>bcpkix-jdk15on</artifactId>
106-
<version>1.66</version>
107+
<version>1.64</version>
107108
</dependency>
108109
<dependency>
109110
<groupId>org.bouncycastle</groupId>
110111
<artifactId>bcprov-jdk15on</artifactId>
111-
<version>1.60</version>
112+
<version>1.64</version>
112113
</dependency>
113114
<dependency>
114115
<groupId>com.openpojo</groupId>
@@ -159,6 +160,7 @@
159160
<plugin>
160161
<groupId>org.apache.maven.plugins</groupId>
161162
<artifactId>maven-dependency-plugin</artifactId>
163+
<version>3.1.2</version>
162164
<executions>
163165
<execution>
164166
<id>copy</id>
@@ -197,13 +199,20 @@
197199
<groupId>org.apache.maven.plugins</groupId>
198200
<artifactId>maven-surefire-plugin</artifactId>
199201
<version>3.0.0-M5</version>
202+
<dependencies>
203+
<dependency>
204+
<groupId>org.apache.maven.surefire</groupId>
205+
<artifactId>surefire-junit47</artifactId>
206+
<version>3.0.0-M5</version>
207+
</dependency>
208+
</dependencies>
200209
<configuration>
201210
<trimStackTrace>false</trimStackTrace>
202211
<includes>
203212
<include>**/*.java</include>
204213
</includes>
205214
<!-- Integration tests and slow tests are excluded by default when runing mvn package. Fast tests and not annotated tests are executed -->
206-
<excludedGroups>de.rub.nds.tlsattacker.util.tests.SlowTests,de.rub.nds.tlsattacker.util.tests.IntegrationTests</excludedGroups>
215+
<excludedGroups>${slowTests}</excludedGroups>
207216
<argLine>
208217
-javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
209218
</argLine>
@@ -213,13 +222,20 @@
213222
<groupId>org.apache.maven.plugins</groupId>
214223
<artifactId>maven-failsafe-plugin</artifactId>
215224
<version>3.0.0-M5</version>
225+
<dependencies>
226+
<dependency>
227+
<groupId>org.apache.maven.surefire</groupId>
228+
<artifactId>surefire-junit47</artifactId>
229+
<version>3.0.0-M5</version>
230+
</dependency>
231+
</dependencies>
216232
<configuration>
217233
<!-- By default, the Failsafe plugin excludes various files. We have to override that. -->
218234
<excludes>
219235
<exclude>**/*.java</exclude>
220236
</excludes>
221237
<!-- Integration tests and slow tests are started -->
222-
<groups>${includegroups}</groups>
238+
<groups>${slowTests}</groups>
223239
</configuration>
224240
<executions>
225241
<execution>
@@ -315,7 +331,7 @@
315331
<configuration>
316332
<rules>
317333
<requireMavenVersion>
318-
<version>3.1</version>
334+
<version>3.3.9</version>
319335
</requireMavenVersion>
320336
<requireJavaVersion>
321337
<version>1.8,11</version>
@@ -328,7 +344,7 @@
328344
<plugin>
329345
<groupId>org.apache.maven.plugins</groupId>
330346
<artifactId>maven-source-plugin</artifactId>
331-
<version>3.0.1</version>
347+
<version>3.2.1</version>
332348
<executions>
333349
<execution>
334350
<id>attach-sources</id>
@@ -341,7 +357,7 @@
341357
<plugin>
342358
<groupId>org.apache.maven.plugins</groupId>
343359
<artifactId>maven-javadoc-plugin</artifactId>
344-
<version>2.10.4</version>
360+
<version>3.2.0</version>
345361
<executions>
346362
<execution>
347363
<id>attach-javadocs</id>
@@ -401,20 +417,20 @@
401417
<plugin>
402418
<groupId>org.apache.maven.plugins</groupId>
403419
<artifactId>maven-checkstyle-plugin</artifactId>
404-
<version>2.17</version>
420+
<version>3.1.1</version>
405421
<configuration>
406422
<configLocation>${main.basedir}/checkstyle.xml</configLocation>
407423
</configuration>
408424
</plugin>
409425
<plugin>
410426
<groupId>org.apache.maven.plugins</groupId>
411427
<artifactId>maven-pmd-plugin</artifactId>
412-
<version>3.8</version>
428+
<version>3.13.0</version>
413429
</plugin>
414430
<plugin>
415431
<groupId>org.apache.maven.plugins</groupId>
416432
<artifactId>maven-jxr-plugin</artifactId>
417-
<version>2.5</version>
433+
<version>3.0.0</version>
418434
</plugin>
419435
<plugin>
420436
<groupId>org.apache.maven.plugins</groupId>
@@ -438,5 +454,6 @@
438454
but cannot be performed by typical users. Enable it using -Dskip.signature=false -->
439455
<skip.signature>true</skip.signature>
440456
<jmockit.version>1.49</jmockit.version>
457+
<slowTests>de.rub.nds.tlsattacker.util.tests.SlowTests,de.rub.nds.tlsattacker.util.tests.IntegrationTests</slowTests>
441458
</properties>
442459
</project>

0 commit comments

Comments
 (0)