aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Manico <jim@manicode.com>2018-12-31 13:02:30 -1000
committerGitHub <noreply@github.com>2018-12-31 13:02:30 -1000
commitbc9a85723f3c1b4819d9aa8aa1b539787128e4ea (patch)
tree57dcbf767a603a6bf268d0ce159fe5f3ed18fc2f
parent43cfb9c441d5bcf093b9cdbc9395f1ce88e99f11 (diff)
parent0a23cadf3d2d7bd838f90f1073375e2b17b1f050 (diff)
downloadjava-encoder-bc9a85723f3c1b4819d9aa8aa1b539787128e4ea.tar.gz
Merge pull request #28 from OWASP/upgradeTestDependencies
Update test dependencies
-rw-r--r--.travis.yml1
-rw-r--r--jsp/pom.xml4
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/EncodingTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForCDATATagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForCssStringTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForCssUrlTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForHtmlAttributeTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForHtmlContentTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForHtmlTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForHtmlUnquotedAttributeTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptAttributeTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptBlockTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptSourceTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForUriComponentTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForUriTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForXmlAttributeTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForXmlCommentTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForXmlContentTagTest.java2
-rw-r--r--jsp/src/test/java/org/owasp/encoder/tag/ForXmlTagTest.java2
20 files changed, 20 insertions, 21 deletions
diff --git a/.travis.yml b/.travis.yml
index a922710..a26172b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: java
jdk:
- - openjdk7
- openjdk8
- oraclejdk8
# to compile using JDK 9+ we must move from source and target 1.5 to 1.6
diff --git a/jsp/pom.xml b/jsp/pom.xml
index 3deb261..2407a5c 100644
--- a/jsp/pom.xml
+++ b/jsp/pom.xml
@@ -76,13 +76,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>3.1.3.RELEASE</version>
+ <version>5.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.1.3.RELEASE</version>
+ <version>5.1.3.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/EncodingTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/EncodingTagTest.java
index 10705ae..4f49e8b 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/EncodingTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/EncodingTagTest.java
@@ -54,7 +54,7 @@ public abstract class EncodingTagTest extends TestCase {
protected MockHttpServletResponse _response;
/**
- * Contructor for the EncodingTagTest
+ * Constructor for the EncodingTagTest
* @param testName the name of the test
*/
public EncodingTagTest(String testName) {
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForCDATATagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForCDATATagTest.java
index e7f6f90..c8e3847 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForCDATATagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForCDATATagTest.java
@@ -59,7 +59,7 @@ public class ForCDATATagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForCDATATag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForCssStringTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForCssStringTagTest.java
index 7a79d40..0c9d6e8 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForCssStringTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForCssStringTagTest.java
@@ -59,7 +59,7 @@ public class ForCssStringTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForCssStringTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForCssUrlTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForCssUrlTagTest.java
index c787988..77936c3 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForCssUrlTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForCssUrlTagTest.java
@@ -59,7 +59,7 @@ public class ForCssUrlTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForCssUrlTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlAttributeTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlAttributeTagTest.java
index 34d63fc..3c0c64f 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlAttributeTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlAttributeTagTest.java
@@ -59,7 +59,7 @@ public class ForHtmlAttributeTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForHtmlAttributeTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlContentTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlContentTagTest.java
index 9a9703c..ef6e389 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlContentTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlContentTagTest.java
@@ -59,7 +59,7 @@ public class ForHtmlContentTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForHtmlContentTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlTagTest.java
index 9f73173..03897a7 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlTagTest.java
@@ -59,7 +59,7 @@ public class ForHtmlTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForHtmlTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlUnquotedAttributeTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlUnquotedAttributeTagTest.java
index 4d1cae0..bce53a4 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlUnquotedAttributeTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForHtmlUnquotedAttributeTagTest.java
@@ -59,7 +59,7 @@ public class ForHtmlUnquotedAttributeTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForHtmlUnquotedAttributeTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptAttributeTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptAttributeTagTest.java
index 6829820..ad38c07 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptAttributeTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptAttributeTagTest.java
@@ -59,7 +59,7 @@ public class ForJavaScriptAttributeTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForJavaScriptAttributeTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptBlockTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptBlockTagTest.java
index 79d7163..75cf97e 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptBlockTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptBlockTagTest.java
@@ -59,7 +59,7 @@ public class ForJavaScriptBlockTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForJavaScriptBlockTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptSourceTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptSourceTagTest.java
index 400c8d9..0ea95fc 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptSourceTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptSourceTagTest.java
@@ -59,7 +59,7 @@ public class ForJavaScriptSourceTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForJavaScriptSourceTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptTagTest.java
index c7427a7..2d4f67a 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForJavaScriptTagTest.java
@@ -28,7 +28,7 @@ public class ForJavaScriptTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForJavaScriptTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForUriComponentTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForUriComponentTagTest.java
index 6709cde..3d9d11c 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForUriComponentTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForUriComponentTagTest.java
@@ -59,7 +59,7 @@ public class ForUriComponentTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForUriComponentTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForUriTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForUriTagTest.java
index d401d89..ac16812 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForUriTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForUriTagTest.java
@@ -59,7 +59,7 @@ public class ForUriTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForUriTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlAttributeTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlAttributeTagTest.java
index ec42f28..4246516 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlAttributeTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlAttributeTagTest.java
@@ -59,7 +59,7 @@ public class ForXmlAttributeTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForXmlAttributeTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlCommentTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlCommentTagTest.java
index cf5182a..cea3db3 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlCommentTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlCommentTagTest.java
@@ -59,7 +59,7 @@ public class ForXmlCommentTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForXmlCommentTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlContentTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlContentTagTest.java
index 1efd061..536c265 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlContentTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlContentTagTest.java
@@ -59,7 +59,7 @@ public class ForXmlContentTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForXmlContentTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/
diff --git a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlTagTest.java b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlTagTest.java
index 59d54dc..b55d2be 100644
--- a/jsp/src/test/java/org/owasp/encoder/tag/ForXmlTagTest.java
+++ b/jsp/src/test/java/org/owasp/encoder/tag/ForXmlTagTest.java
@@ -59,7 +59,7 @@ public class ForXmlTagTest extends EncodingTagTest {
/**
* Test of doTag method, of class ForXmlTag.
* This is a very simple test that doesn't fully
- * excersize/test the encoder - only that the
+ * exercise/test the encoder - only that the
* tag itself works.
* @throws Exception is thrown if the tag fails.
*/