Skip to content

Commit f834e73

Browse files
Dave WichersDave Wichers
Dave Wichers
authored and
Dave Wichers
committed
Upgrade some dependencies and a little pom cleanup.
1 parent 1094610 commit f834e73

File tree

3 files changed

+162
-84
lines changed

3 files changed

+162
-84
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.java-version
12
/target
23
/.idea
34
/.settings
@@ -6,4 +7,6 @@
67
/contrast.jar
78
/*.iml
89
/chromedriver
9-
/chromedriver.exe
10+
/chromedriver.exe
11+
spring-xml-parsers/target
12+

‎pom.xml‎

Lines changed: 156 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,112 +4,177 @@
44

55
<groupId>org.owasp</groupId>
66
<artifactId>java-security-unit-tests</artifactId>
7-
<version>0.5.1</version>
7+
<version>0.5.2</version>
88
<packaging>war</packaging>
99

1010
<name>Java Security Unit Tests</name>
1111
<url>https://github.com/davewichers/security-unit-tests</url>
1212

13-
<repositories>
14-
<repository>
15-
<id>central</id>
16-
<name>Maven Central</name>
17-
<url>https://repo1.maven.org/maven2/</url>
18-
</repository>
19-
<!-- Both of these repos were attempts to get xqj-api pom/jar, and both fail. So installed
13+
<!-- repositories>
14+
<Both of these repos were attempts to get xqj-api pom/jar, and both fail. So installed
2015
manually now via: mvn initialize configuration (see below).
2116
The following repo contains xqj-api artifact but requires JFrog account, which isn't free.
2217
<repository>
2318
<id>spring-plugins</id>
2419
<name>Spring Plugins</name>
2520
<url>https://repo.spring.io/plugins-release/</url>
26-
</repository -->
27-
<!--repository : this repo has an invalid SSL cert so can't download, and http is not available anymore.>
21+
</repository>
22+
<repository : this repo has an invalid SSL cert so can't download, and http is not available anymore.>
2823
<id>xqj</id>
2924
<name>An XQuery Repository</name>
3025
<url>https://xqj.net/maven/</url>
31-
</repository-->
32-
</repositories>
26+
</repository>
27+
</repositories -->
3328

3429
<properties>
3530
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
31+
<project.java.target>1.8</project.java.target>
3632
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
37-
<maven.compiler.source>1.7</maven.compiler.source>
38-
<maven.compiler.target>1.7</maven.compiler.target>
33+
<maven.compiler.source>${project.java.target}</maven.compiler.source>
34+
<maven.compiler.target>${project.java.target}</maven.compiler.target>
3935
<skipTests>false</skipTests>
40-
<!-- log4j 2.13.0+ requires Java 8. -->
41-
<version.log4j>2.17.1</version.log4j>
42-
<cargo.maven2.version>1.6.9</cargo.maven2.version>
36+
<version.log4j>2.19.0</version.log4j>
37+
<cargo.version>1.10.3</cargo.version>
4338
<!-- tomcat 8.5 is last version to support Java 7. Tomcat 9+ requires Java 8. -->
4439
<tomcat.major.version>8</tomcat.major.version>
4540
<version.tomcat>8.5.32</version.tomcat>
4641
<tomcat.url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${version.tomcat}/bin/apache-tomcat-${version.tomcat}.zip</tomcat.url>
4742
</properties>
4843

4944
<build>
45+
46+
<pluginManagement>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.apache.maven.plugins</groupId>
50+
<artifactId>maven-assembly-plugin</artifactId>
51+
<version>3.4.2</version>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-dependency-plugin</artifactId>
56+
<version>3.3.0</version>
57+
<configuration>
58+
<usedDependencies>
59+
</usedDependencies>
60+
</configuration>
61+
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-release-plugin</artifactId>
65+
<version>3.0.0-M7</version>
66+
</plugin>
67+
</plugins>
68+
</pluginManagement>
69+
5070
<plugins>
71+
<plugin>
72+
<groupId>org.apache.maven.plugins</groupId>
73+
<artifactId>maven-deploy-plugin</artifactId>
74+
<version>3.0.0</version>
75+
</plugin>
5176
<plugin>
5277
<groupId>org.apache.maven.plugins</groupId>
5378
<artifactId>maven-enforcer-plugin</artifactId>
54-
<version>3.0.0-M3</version>
55-
<dependencies>
56-
<dependency>
57-
<groupId>org.codehaus.mojo</groupId>
58-
<artifactId>extra-enforcer-rules</artifactId>
59-
<version>1.2</version>
60-
</dependency>
61-
</dependencies>
62-
<executions>
63-
<execution>
64-
<id>enforce-bytecode-version</id>
65-
<goals><goal>enforce</goal></goals>
66-
<configuration>
67-
<rules>
68-
<enforceBytecodeVersion>
69-
<maxJdkVersion>1.7</maxJdkVersion>
70-
<excludes>
71-
<!-- guava includes backports for Java 7 compatibility -->
72-
<exclude>com.google.guava:guava</exclude>
73-
</excludes>
74-
<ignoredScopes>test</ignoredScopes>
75-
<message>Dependencies shouldn't require Java 8+.</message>
76-
</enforceBytecodeVersion>
77-
</rules>
78-
<fail>warn</fail>
79-
</configuration>
80-
</execution>
81-
<execution>
82-
<id>enforce-jdk-version</id>
83-
<goals><goal>enforce</goal></goals>
84-
<configuration>
85-
<rules>
86-
<requireJavaVersion>
87-
<version>1.7</version>
88-
<message>Benchmark is currently written to support Java 7 and 8.</message>
89-
</requireJavaVersion>
90-
</rules>
91-
</configuration>
92-
</execution>
93-
</executions>
79+
<version>3.1.0</version>
80+
<dependencies>
81+
<dependency>
82+
<groupId>org.codehaus.mojo</groupId>
83+
<artifactId>extra-enforcer-rules</artifactId>
84+
<version>1.6.1</version>
85+
</dependency>
86+
<dependency>
87+
<groupId>org.codehaus.mojo</groupId>
88+
<artifactId>animal-sniffer-enforcer-rule</artifactId>
89+
<version>1.22</version>
90+
</dependency>
91+
</dependencies>
92+
<executions>
93+
<execution>
94+
<id>enforce-bytecode-version</id>
95+
<goals><goal>enforce</goal></goals>
96+
<configuration>
97+
<rules>
98+
<enforceBytecodeVersion>
99+
<maxJdkVersion>1.8</maxJdkVersion>
100+
<ignoredScopes>test</ignoredScopes>
101+
<message>Dependencies shouldn't require Java 9+.</message>
102+
</enforceBytecodeVersion>
103+
<requireMavenVersion>
104+
<version>3.3.9</version>
105+
</requireMavenVersion>
106+
</rules>
107+
<fail>warn</fail>
108+
</configuration>
109+
</execution>
110+
<execution>
111+
<id>enforce-jdk-version</id>
112+
<goals><goal>enforce</goal></goals>
113+
<configuration>
114+
<rules>
115+
<requireJavaVersion>
116+
<version>${project.java.target}</version>
117+
<message>These tests are currently written to support Java 8.</message>
118+
</requireJavaVersion>
119+
</rules>
120+
</configuration>
121+
</execution>
122+
</executions>
94123
</plugin>
95124

96125
<plugin>
97126
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-war-plugin</artifactId>
99-
<version>3.2.2</version>
127+
<artifactId>maven-clean-plugin</artifactId>
128+
<version>3.2.0</version>
129+
</plugin>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-compiler-plugin</artifactId>
133+
<version>3.10.1</version>
100134
<configuration>
101-
<archiveClasses>true</archiveClasses>
135+
<source>${project.java.target}</source>
136+
<target>${project.java.target}</target>
137+
<testSource>${project.java.target}</testSource>
138+
<testTarget>${project.java.target}</testTarget>
139+
<compilerArgument>
140+
<!-- Eventual desire is to use -Xlint:all -->
141+
-Xlint:unchecked
142+
</compilerArgument>
102143
</configuration>
103144
</plugin>
104145
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
147+
<artifactId>maven-project-info-reports-plugin</artifactId>
148+
<version>3.4.1</version>
149+
</plugin>
150+
<plugin>
151+
<groupId>org.apache.maven.plugins</groupId>
152+
<artifactId>maven-resources-plugin</artifactId>
153+
<version>3.3.0</version>
154+
</plugin>
155+
<plugin>
156+
<!-- Note: This uses the maven-fluido-skin version specified next. The skin is referenced in src/site/site.xml. -->
105157
<groupId>org.apache.maven.plugins</groupId>
106158
<artifactId>maven-site-plugin</artifactId>
107-
<version>3.7.1</version>
159+
<version>4.0.0-M3</version>
160+
</plugin>
161+
<plugin>
162+
<groupId>org.apache.maven.skins</groupId>
163+
<artifactId>maven-fluido-skin</artifactId>
164+
<version>1.11.1</version>
165+
</plugin>
166+
<plugin>
167+
<groupId>org.apache.maven.plugins</groupId>
168+
<artifactId>maven-war-plugin</artifactId>
169+
<version>3.3.2</version>
170+
<configuration>
171+
<archiveClasses>true</archiveClasses>
172+
</configuration>
108173
</plugin>
109174
<plugin>
110175
<groupId>org.codehaus.cargo</groupId>
111-
<artifactId>cargo-maven2-plugin</artifactId>
112-
<version>${cargo.maven2.version}</version>
176+
<artifactId>cargo-maven3-plugin</artifactId>
177+
<version>${cargo.version}</version>
113178
<configuration>
114179
<container>
115180
<containerId>tomcat${tomcat.major.version}x</containerId>
@@ -122,7 +187,7 @@
122187
<plugin>
123188
<groupId>org.apache.maven.plugins</groupId>
124189
<artifactId>maven-install-plugin</artifactId>
125-
<version>3.0.0-M1</version>
190+
<version>3.0.1</version>
126191
<executions>
127192
<!-- NOTE: To do this install, you have to run: mvn initialize -->
128193
<execution>
@@ -219,8 +284,13 @@
219284
</plugin>
220285
<plugin>
221286
<groupId>org.apache.maven.plugins</groupId>
222-
<artifactId>maven-surefire-report-plugin</artifactId>
223-
<version>2.22.1</version>
287+
<artifactId>maven-surefire-plugin</artifactId>
288+
<version>3.0.0-M7</version>
289+
</plugin>
290+
<plugin>
291+
<groupId>org.codehaus.mojo</groupId>
292+
<artifactId>versions-maven-plugin</artifactId>
293+
<version>2.13.0</version>
224294
</plugin>
225295
</plugins>
226296
</build>
@@ -232,8 +302,8 @@
232302
<plugins>
233303
<plugin>
234304
<groupId>org.codehaus.cargo</groupId>
235-
<artifactId>cargo-maven2-plugin</artifactId>
236-
<version>${cargo.maven2.version}</version>
305+
<artifactId>cargo-maven3-plugin</artifactId>
306+
<version>${cargo.version}</version>
237307
<configuration>
238308
<container>
239309
<containerId>tomcat${tomcat.major.version}x</containerId>
@@ -261,7 +331,7 @@
261331
<dependency>
262332
<groupId>junit</groupId>
263333
<artifactId>junit</artifactId>
264-
<version>4.13.1</version>
334+
<version>4.13.2</version>
265335
<scope>test</scope>
266336
</dependency>
267337
<dependency>
@@ -306,7 +376,7 @@
306376
<dependency>
307377
<groupId>org.jdom</groupId>
308378
<artifactId>jdom2</artifactId>
309-
<version>2.0.6</version>
379+
<version>2.0.6.1</version>
310380
<exclusions>
311381
<exclusion>
312382
<groupId>xerces</groupId>
@@ -317,7 +387,7 @@
317387
<dependency>
318388
<groupId>org.codehaus.woodstox</groupId>
319389
<artifactId>stax2-api</artifactId>
320-
<version>4.0.0</version>
390+
<version>4.2.1</version>
321391
</dependency>
322392

323393
<!-- XPath APIs -->
@@ -335,8 +405,7 @@
335405
<dependency>
336406
<groupId>org.dom4j</groupId>
337407
<artifactId>dom4j</artifactId>
338-
<!-- v2.1.0+ requires Java 8. -->
339-
<version>2.0.3</version>
408+
<version>2.1.3</version>
340409
<exclusions>
341410
<exclusion>
342411
<groupId>xerces</groupId>
@@ -351,7 +420,7 @@
351420
<dependency>
352421
<groupId>jaxen</groupId>
353422
<artifactId>jaxen</artifactId>
354-
<version>1.1.6</version>
423+
<version>1.2.0</version>
355424
<exclusions>
356425
<exclusion>
357426
<groupId>xerces</groupId>
@@ -404,13 +473,12 @@
404473
<dependency>
405474
<groupId>org.owasp.encoder</groupId>
406475
<artifactId>encoder</artifactId>
407-
<version>1.2.2</version>
476+
<version>1.2.3</version>
408477
</dependency>
409478
<dependency>
410479
<groupId>org.apache.commons</groupId>
411480
<artifactId>commons-text</artifactId>
412-
<!-- v1.4+ requires Java 8 -->
413-
<version>1.3</version>
481+
<version>1.10.0</version>
414482
</dependency>
415483
<dependency>
416484
<groupId>org.apache.logging.log4j</groupId>
@@ -429,11 +497,19 @@
429497
<plugin>
430498
<groupId>org.apache.maven.plugins</groupId>
431499
<artifactId>maven-project-info-reports-plugin</artifactId>
432-
<version>3.0.0</version>
433500
</plugin>
434501
<plugin>
435-
<groupId>org.apache.maven.plugins</groupId>
436-
<artifactId>maven-surefire-report-plugin</artifactId>
502+
<groupId>org.codehaus.mojo</groupId>
503+
<artifactId>versions-maven-plugin</artifactId>
504+
<reportSets>
505+
<reportSet>
506+
<reports>
507+
<report>dependency-updates-report</report>
508+
<report>plugin-updates-report</report>
509+
<report>property-updates-report</report>
510+
</reports>
511+
</reportSet>
512+
</reportSets>
437513
</plugin>
438514
</plugins>
439515
</reporting>

‎spring-xml-parsers/pom.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
<artifactId>spring-xml-parsers</artifactId>
88
<version>0.1.0</version>
99

10-
1110
<properties>
1211
<version.spring>5.0.20.RELEASE</version.spring>
13-
<version.jackson>2.13.4.1</version.jackson>
14-
<java.version>1.7</java.version>
12+
<version.jackson>2.14.0</version.jackson>
13+
<java.version>1.8</java.version>
1514
</properties>
1615

1716
<parent>

0 commit comments

Comments
 (0)