Skip to content

Commit aea19ec

Browse files
author
[email protected]
committed
pom.xml
1) Updated dependencies 2) Added OWASP Dependency Check plugin 3) Added Surefire Report Plugin 4) Updated all plugins to latest version 5) Updated req'd minimum Java Version to 1.6 MockServletContext.java 1) Added getContextPath() method to account for new servlet spec method.
1 parent 3ca93c5 commit aea19ec

File tree

2 files changed

+61
-60
lines changed

2 files changed

+61
-60
lines changed

‎pom.xml

Lines changed: 56 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -81,38 +81,21 @@
8181
<name>Jeff Williams</name>
8282
<organization>Aspect Security</organization>
8383
<roles>
84-
<role>Project Owner</role>
85-
<role>Architect</role>
86-
<role>Developer</role>
87-
</roles>
88-
</developer>
89-
<developer>
90-
<name>Jim Manico</name>
91-
<roles>
92-
<role>Project Manager</role>
93-
<role>BuildMaster</role>
94-
<role>Developer</role>
95-
<role>Architect</role>
84+
<role>Project Inventor</role>
9685
</roles>
9786
</developer>
9887
<developer>
9988
<name>Chris Schmidt</name>
10089
<organization>Aspect Security</organization>
10190
<roles>
102-
<role>Project Manager</role>
103-
<role>Continuous Integration Admin</role>
104-
<role>Architect</role>
105-
<role>Developer</role>
91+
<role>Project Owner</role>
10692
</roles>
10793
</developer>
10894
<developer>
10995
<name>Kevin W. Wall</name>
11096
<organization>Wells Fargo</organization>
11197
<roles>
11298
<role>Project Manager</role>
113-
<role>Architect</role>
114-
<role>Developer</role>
115-
<role>Crypto Guy</role>
11699
</roles>
117100
</developer>
118101
</developers>
@@ -121,11 +104,9 @@
121104
<contributor>
122105
<name>Dave Wichers</name>
123106
<organization>Aspect Security</organization>
124-
<roles>
125-
<role>Documentation and Examples</role>
126-
<role>Minor Code Contributions</role>
127-
<role>Project Guidance</role>
128-
</roles>
107+
</contributor>
108+
<contributor>
109+
<name>Jim Manico</name>
129110
</contributor>
130111
</contributors>
131112

@@ -137,23 +118,23 @@
137118
<dependency>
138119
<groupId>commons-configuration</groupId>
139120
<artifactId>commons-configuration</artifactId>
140-
<version>1.5</version>
121+
<version>1.10</version>
141122
</dependency>
142123
<dependency>
143124
<groupId>commons-beanutils</groupId>
144125
<artifactId>commons-beanutils-core</artifactId>
145-
<version>1.7.0</version>
126+
<version>1.8.3</version>
146127
</dependency>
147128
<dependency>
148129
<groupId>junit</groupId>
149130
<artifactId>junit</artifactId>
150-
<version>4.4</version>
131+
<version>4.5</version>
151132
<scope>test</scope>
152133
</dependency>
153134
<dependency>
154135
<groupId>javax.servlet</groupId>
155136
<artifactId>servlet-api</artifactId>
156-
<version>2.4</version>
137+
<version>2.5</version>
157138
<scope>provided</scope>
158139
</dependency>
159140
<dependency>
@@ -165,23 +146,19 @@
165146
<dependency>
166147
<groupId>commons-fileupload</groupId>
167148
<artifactId>commons-fileupload</artifactId>
168-
<version>1.2</version>
149+
<version>1.3.1</version>
169150
<scope>compile</scope>
170151
</dependency>
171-
<!-- unused according to dependancy:analyze
172-
this is a optional dependency of commons-fileupload which
173-
is at least needed for testing...
174-
-->
175152
<dependency>
176153
<groupId>commons-io</groupId>
177154
<artifactId>commons-io</artifactId>
178-
<version>1.3</version>
155+
<version>2.4</version>
179156
<scope>test</scope>
180157
</dependency>
181158
<dependency>
182159
<groupId>commons-collections</groupId>
183160
<artifactId>commons-collections</artifactId>
184-
<version>3.2</version>
161+
<version>3.2.1</version>
185162
<scope>compile</scope>
186163
</dependency>
187164
<dependency>
@@ -204,18 +181,18 @@
204181
<dependency>
205182
<groupId>org.owasp.antisamy</groupId>
206183
<artifactId>antisamy</artifactId>
207-
<version>1.4.3</version>
184+
<version>1.5.3</version>
208185
</dependency>
209186
</dependencies>
210187

211188
<build>
212189
<plugins>
213190
<plugin>
214191
<artifactId>maven-compiler-plugin</artifactId>
215-
<version>2.3.2</version>
192+
<version>3.1</version>
216193
<configuration>
217-
<source>1.5</source>
218-
<target>1.5</target>
194+
<source>1.6</source>
195+
<target>1.6</target>
219196
<debug>true</debug>
220197
<showWarnings>true</showWarnings>
221198
<showDeprecation>false</showDeprecation>
@@ -225,15 +202,15 @@
225202
<plugin>
226203
<groupId>org.apache.maven.plugins</groupId>
227204
<artifactId>maven-eclipse-plugin</artifactId>
228-
<version>2.8</version>
205+
<version>2.9</version>
229206
<configuration>
230207
<downloadSources>true</downloadSources>
231208
</configuration>
232209
</plugin>
233210

234211
<plugin>
235212
<artifactId>maven-jar-plugin</artifactId>
236-
<version>2.3.1</version>
213+
<version>2.4</version>
237214
<configuration>
238215
<archive>
239216
<manifest>
@@ -245,24 +222,23 @@
245222
</plugin>
246223

247224
<!-- Check for updates to dependencies and report on them. -->
248-
<!--
249225
<plugin>
250226
<groupId>org.codehaus.mojo</groupId>
251227
<artifactId>versions-maven-plugin</artifactId>
252-
<version>1.2</version>
228+
<version>2.1</version>
253229
<executions>
254230
<execution>
255231
<id>check-for-dependency-updates</id>
256-
<phase>compile</phase> &lt;!&ndash; Eclipse q4e plugin needs this &ndash;&gt;
232+
<phase>compile</phase> <!-- Eclipse q4e plugin needs this -->
257233
<goals>
258234
<goal>display-dependency-updates</goal>
259235
<goal>display-plugin-updates</goal>
260-
<goal>display-property-updates</goal>
236+
<!--<goal>display-property-updates</goal>-->
261237
</goals>
262238
</execution>
263239
</executions>
264240
</plugin>
265-
-->
241+
266242
</plugins>
267243
</build>
268244

@@ -271,7 +247,7 @@
271247
<plugin>
272248
<groupId>org.codehaus.mojo</groupId>
273249
<artifactId>findbugs-maven-plugin</artifactId>
274-
<version>2.3.1</version>
250+
<version>2.5.3</version>
275251
<configuration>
276252
<findbugsXmlOutput>true</findbugsXmlOutput>
277253
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
@@ -284,7 +260,7 @@
284260
<plugin>
285261
<groupId>org.codehaus.mojo</groupId>
286262
<artifactId>cobertura-maven-plugin</artifactId>
287-
<version>2.4</version>
263+
<version>2.6</version>
288264
<configuration>
289265
<formats>
290266
<format>html</format>
@@ -295,11 +271,11 @@
295271
<plugin>
296272
<groupId>org.codehaus.mojo</groupId>
297273
<artifactId>jdepend-maven-plugin</artifactId>
298-
<version>2.0-beta-2</version>
274+
<version>2.0</version>
299275
</plugin>
300276
<plugin>
301277
<artifactId>maven-pmd-plugin</artifactId>
302-
<version>2.5</version>
278+
<version>3.1</version>
303279
<configuration>
304280
<targetJdk>1.5</targetJdk>
305281
<sourceEncoding>utf-8</sourceEncoding>
@@ -308,7 +284,7 @@
308284
<plugin>
309285
<groupId>org.apache.maven.plugins</groupId>
310286
<artifactId>maven-javadoc-plugin</artifactId>
311-
<version>2.7</version>
287+
<version>2.9.1</version>
312288
<configuration>
313289
<detectJavaApiLink>false</detectJavaApiLink>
314290
<detectLinks>false</detectLinks>
@@ -328,14 +304,14 @@
328304
<issueLinkUrl>http://code.google.com/p/owasp-esapi-java/issues/detail?id=%ISSUE%</issueLinkUrl>
329305
<type>date</type>
330306
<dates>
331-
<date>2011-05-11 00:00:00</date>
307+
<date>2013-09-02 00:00:00</date>
332308
</dates>
333309
</configuration>
334310
</plugin>
335311
<plugin>
336312
<groupId>org.codehaus.mojo</groupId>
337313
<artifactId>versions-maven-plugin</artifactId>
338-
<version>1.2</version>
314+
<version>2.1</version>
339315
<reportSets>
340316
<reportSet>
341317
<reports>
@@ -346,6 +322,19 @@
346322
</reportSet>
347323
</reportSets>
348324
</plugin>
325+
<plugin>
326+
<groupId>org.owasp</groupId>
327+
<artifactId>dependency-check-maven</artifactId>
328+
<version>1.1.4</version>
329+
<configuration>
330+
<externalReport>false</externalReport>
331+
</configuration>
332+
</plugin>
333+
<plugin>
334+
<groupId>org.apache.maven.plugins</groupId>
335+
<artifactId>maven-surefire-report-plugin</artifactId>
336+
<version>2.17</version>
337+
</plugin>
349338
</plugins>
350339
</reporting>
351340

@@ -383,6 +372,7 @@
383372
<plugin>
384373
<groupId>org.apache.maven.plugins</groupId>
385374
<artifactId>maven-gpg-plugin</artifactId>
375+
<version>1.5</version>
386376
<executions>
387377
<execution>
388378
<id>sign-artifacts</id>
@@ -400,7 +390,8 @@
400390
<plugin>
401391
<groupId>org.apache.maven.plugins</groupId>
402392
<artifactId>maven-jar-plugin</artifactId>
403-
<version>2.3.1</version>
393+
<version>2.4</version>
394+
<!--
404395
<executions>
405396
<execution>
406397
<phase>package</phase>
@@ -409,10 +400,13 @@
409400
</goals>
410401
</execution>
411402
</executions>
403+
-->
412404
<configuration>
405+
<!--
413406
<keystore>codesign.keystore</keystore>
414407
<alias>owasp foundation, inc.'s godaddy.com, inc. id</alias>
415408
<verify>true</verify>
409+
-->
416410
<archive>
417411
<manifest>
418412
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
@@ -425,11 +419,12 @@
425419
</configuration>
426420
</plugin>
427421

428-
<!-- Baseline for ESAPI 2.0 is JDK1.5 - Enforces that a JDK1.5 compiler is being
422+
<!-- Baseline for ESAPI 2.1 is JDK1.6 - Enforces that a JDK1.6 compiler is being
429423
used to build this release -->
430424
<plugin>
431425
<groupId>org.apache.maven.plugins</groupId>
432426
<artifactId>maven-enforcer-plugin</artifactId>
427+
<version>1.3.1</version>
433428
<executions>
434429
<execution>
435430
<id>enforce-jdk-version</id>
@@ -439,10 +434,10 @@
439434
<configuration>
440435
<rules>
441436
<requireJavaVersion>
442-
<version>1.5</version>
437+
<version>1.6</version>
443438
<message>
444-
ESAPI 2.0 uses the JDK1.5 for it's baseline. Please make sure that your
445-
JAVA_HOME environment variable is pointed to a JDK1.5 distribution.
439+
ESAPI 2.1 uses the JDK1.6 for it's baseline. Please make sure that your
440+
JAVA_HOME environment variable is pointed to a JDK1.6 distribution.
446441
</message>
447442
</requireJavaVersion>
448443
</rules>
@@ -455,6 +450,7 @@
455450
<plugin>
456451
<groupId>org.apache.maven.plugins</groupId>
457452
<artifactId>maven-javadoc-plugin</artifactId>
453+
<version>2.9.1</version>
458454
<executions>
459455
<execution>
460456
<id>attach-javadocs</id>
@@ -469,7 +465,7 @@
469465
<plugin>
470466
<groupId>org.apache.maven.plugins</groupId>
471467
<artifactId>maven-assembly-plugin</artifactId>
472-
<version>2.2</version>
468+
<version>2.4</version>
473469
<configuration>
474470
<descriptors>
475471
<descriptor>src/main/assembly/dist.xml</descriptor>
@@ -491,7 +487,7 @@
491487
<plugin>
492488
<groupId>org.apache.maven.plugins</groupId>
493489
<artifactId>maven-release-plugin</artifactId>
494-
<version>2.1</version>
490+
<version>2.5</version>
495491
<configuration>
496492
<tagBase>https://owasp-esapi-java.googlecode.com/svn/tags/releases/</tagBase>
497493
</configuration>

‎src/test/java/org/owasp/esapi/http/MockServletContext.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
* @version $Rev: 46019 $ $Date: 2004-09-14 04:56:06 -0500 (Tue, 14 Sep 2004) $
5858
*/
5959
public class MockServletContext implements ServletContext {
60+
@Override
61+
public String getContextPath() {
62+
return "/";
63+
}
64+
6065
/**
6166
* Returns a <code>ServletContext</code> object that
6267
* corresponds to a specified URL on the server.

0 commit comments

Comments
 (0)