diff --git a/.gitignore b/.gitignore index 992d433..ab4a6f9 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,6 @@ maven-eclipse.xml nb-configuration.xml */nbproject/* +/jsp/target/ +/esapi/target/ +/target/ diff --git a/esapi/pom.xml b/esapi/pom.xml index fbf5c1f..cc26851 100644 --- a/esapi/pom.xml +++ b/esapi/pom.xml @@ -67,7 +67,7 @@ org.owasp.esapi esapi - [2.2,3) + [2.2.3.1,3) diff --git a/jsp/src/main/java/org/owasp/encoder/tag/EncodingTag.java b/jsp/src/main/java/org/owasp/encoder/tag/EncodingTag.java index 369b001..ef9b482 100644 --- a/jsp/src/main/java/org/owasp/encoder/tag/EncodingTag.java +++ b/jsp/src/main/java/org/owasp/encoder/tag/EncodingTag.java @@ -37,7 +37,7 @@ import javax.servlet.jsp.tagext.SimpleTagSupport; /** - * The base class for the encoding tags within tihs package. + * The base class for the encoding tags within this package. * * @author Jeremy Long (jeremy.long@gmail.com) */ diff --git a/pom.xml b/pom.xml index 5d1a085..069f16f 100755 --- a/pom.xml +++ b/pom.xml @@ -162,27 +162,27 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.10.1 org.apache.maven.plugins maven-jar-plugin - 3.0.2 + 3.2.2 org.apache.maven.plugins maven-source-plugin - 3.0.1 + 3.2.1 org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.4.0 - org.codehaus.mojo - cobertura-maven-plugin - 2.6 + org.jacoco + jacoco-maven-plugin + 0.8.8 org.apache.maven.plugins @@ -266,8 +266,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.6 + 1.6 @@ -292,24 +292,17 @@ - org.codehaus.mojo - cobertura-maven-plugin - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - + org.jacoco + jacoco-maven-plugin + prepare-agent - clean + prepare-agent + + surefireArgLine + @@ -320,7 +313,7 @@ org/owasp/encoder/BenchmarkTest.java - -Xmx1024m -XX:MaxPermSize=256m + ${surefireArgLine} @@ -333,12 +326,6 @@ jar - - true - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - @@ -365,6 +352,10 @@ jar + + 1.6 + false + @@ -424,8 +415,16 @@ - org.codehaus.mojo - cobertura-maven-plugin + org.jacoco + jacoco-maven-plugin + + + + + report + + + org.apache.maven.plugins @@ -445,6 +444,10 @@ javadoc + + 1.6 + false +