Skip to content

Commit 178f2bd

Browse files
committed
Close issue ESAPI#429.
Details: Update <targetJdk> for PMD plugin from 1.5 to 1.7 Update version for <requireJavaVersion> for maven-enforcer-plugin from 1.6 to 1.7 Update batik from 1.9 to 1.9.1 Add test dependency for Bouncy Castle 1.58 (only required for JUnit tests) Added some compiler flags (warnings) for CII Badging effort Update version of Dependency Check used to 2.1.0 Update maven-javadoc-plugin to 3.0.0-M1 Update commons-io from 2.5 to 2.6 (only used for JUnit tests)
1 parent 3c8077a commit 178f2bd

File tree

1 file changed

+41
-8
lines changed

1 file changed

+41
-8
lines changed

pom.xml

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,13 @@
102102
<role>Project Co-owner</role>
103103
</roles>
104104
</developer>
105+
<developer>
106+
<name>Chris Schmidt</name>
107+
<organization>Synopsys</organization>
108+
<roles>
109+
<role>Former project co-owner</role>
110+
</roles>
111+
</developer>
105112
</developers>
106113

107114
<contributors>
@@ -142,6 +149,12 @@
142149
<version>4.12</version>
143150
<scope>test</scope>
144151
</dependency>
152+
<dependency>
153+
<groupId>org.bouncycastle</groupId>
154+
<artifactId>bcprov-jdk15on</artifactId>
155+
<version>1.58</version>
156+
<scope>test</scope>
157+
</dependency>
145158
<dependency>
146159
<groupId>javax.servlet</groupId>
147160
<artifactId>javax.servlet-api</artifactId>
@@ -163,7 +176,7 @@
163176
<dependency>
164177
<groupId>commons-io</groupId>
165178
<artifactId>commons-io</artifactId>
166-
<version>2.5</version>
179+
<version>2.6</version>
167180
<scope>test</scope>
168181
</dependency>
169182
<dependency>
@@ -209,7 +222,7 @@
209222
<dependency>
210223
<groupId>org.apache.xmlgraphics</groupId>
211224
<artifactId>batik-css</artifactId>
212-
<version>1.9</version>
225+
<version>1.9.1</version>
213226
</dependency>
214227
<!-- <dependency>
215228
<groupId>org.mockito</groupId>
@@ -266,6 +279,25 @@
266279
<debug>true</debug>
267280
<showWarnings>true</showWarnings>
268281
<showDeprecation>false</showDeprecation>
282+
<compilerArgs>
283+
<!-- This fails:
284+
<arg>-Xmaxwarns 2000</arg>
285+
Must be passed as two separate args, as shown
286+
below.
287+
-->
288+
<arg>-Xmaxwarns</arg>
289+
<arg>2000</arg>
290+
<arg>
291+
<!-- Eventually desire is to use just
292+
-Xlint:all
293+
here, but for now, this is just to cross off
294+
another criteria for CII Badging process.
295+
However, this is main reason we increased
296+
maxwarns above.
297+
-->
298+
-Xlint:all,-deprecation,-rawtypes,-unchecked
299+
</arg>
300+
</compilerArgs>
269301
</configuration>
270302
</plugin>
271303

@@ -330,7 +362,7 @@
330362
<plugin>
331363
<groupId>org.owasp</groupId>
332364
<artifactId>dependency-check-maven</artifactId>
333-
<version>1.4.4</version>
365+
<version>2.1.0</version>
334366
<configuration>
335367
<failBuildOnCVSS>5.9</failBuildOnCVSS>
336368
<suppressionFile>./suppressions.xml</suppressionFile>
@@ -370,7 +402,7 @@
370402
<artifactId>maven-pmd-plugin</artifactId>
371403
<version>3.6</version>
372404
<configuration>
373-
<targetJdk>1.5</targetJdk>
405+
<targetJdk>1.7</targetJdk>
374406
<sourceEncoding>utf-8</sourceEncoding>
375407
</configuration>
376408
</plugin>
@@ -464,6 +496,7 @@
464496
<plugin>
465497
<groupId>org.apache.maven.plugins</groupId>
466498
<artifactId>maven-javadoc-plugin</artifactId>
499+
<version>3.0.0-M1</version>
467500
<configuration>
468501
<additionalparam>-Xdoclint:none</additionalparam>
469502
</configuration>
@@ -568,7 +601,7 @@
568601
</configuration>
569602
</plugin>
570603

571-
<!-- Baseline for ESAPI 2.1 is JDK1.6 - Enforces that a JDK1.6 compiler is being
604+
<!-- Baseline for ESAPI 2.x is now JDK1.7 - Enforces that a JDK1.7 compiler is being
572605
used to build this release -->
573606
<plugin>
574607
<groupId>org.apache.maven.plugins</groupId>
@@ -583,10 +616,10 @@
583616
<configuration>
584617
<rules>
585618
<requireJavaVersion>
586-
<version>1.6</version>
619+
<version>1.7</version>
587620
<message>
588-
ESAPI 2.1 uses the JDK1.6 for it's baseline. Please make sure that your
589-
JAVA_HOME environment variable is pointed to a JDK1.6 distribution.
621+
ESAPI 2.x now uses the JDK1.7 for it's baseline. Please make sure that your
622+
JAVA_HOME environment variable is pointed to a JDK1.7 distribution.
590623
</message>
591624
</requireJavaVersion>
592625
</rules>

0 commit comments

Comments
 (0)