Skip to content
Browse files

Bumped version and copyrights, added Alex, moved around JavaDocs, cha…

…nged JavaDoc pom entry to forced 1.7 format
  • Loading branch information...
1 parent ff46e00 commit d7679310d1875181b073f64381ba628489cc395d @jonpasski jonpasski committed Feb 25, 2013
View
2 README.md
@@ -29,7 +29,7 @@ To include this library into your Maven project, add the following:
<dependency>
<groupId>com.coverity.security</groupId>
<artifactId>coverity-escapers</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
```
View
2 coverity-escapers/README.md
@@ -30,7 +30,7 @@ To include this library into your Maven project, add the following to your pom:
<dependency>
<groupId>com.coverity.security</groupId>
<artifactId>coverity-escapers</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</dependency>
```
View
3 coverity-escapers/src/main/java/com/coverity/security/Escape.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012, Coverity, Inc.
+ * Copyright (c) 2012-2013, Coverity, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -48,6 +48,7 @@
* @author Romain Gaucher
* @author Andy Chou
* @author Jon Passki
+ * @author Alex Kouzemtchenko
*
*/
public class Escape {
View
2 coverity-escapers/src/main/java/com/coverity/security/EscapeEL.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012, Coverity, Inc.
+ * Copyright (c) 2012-2013, Coverity, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
View
15 coverity-escapers/src/main/java/com/coverity/security/Filter.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012, Coverity, Inc.
+ * Copyright (c) 2013, Coverity, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
@@ -26,6 +26,9 @@
*/
package com.coverity.security;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* Filter is a small set of methods for filtering tainted data that cannot be escaped. These
* methods may change the semantics of the data if it cannot be determined to be safe, however
@@ -46,11 +49,6 @@
* @author Alex Kouzemtchenko
* @author Romain Gaucher
*/
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
public class Filter {
private static final Pattern OCTAL_REGEX = Pattern.compile("(0+)([0-7]*)");
@@ -80,6 +78,7 @@ public static String asNumber(String number) {
* @param number the potential number to filter
* @param defaultNumber a default String to return if the number argument is not a Number
* @return a sanitised number or defaultNumber if there is no conversion
+ * @since 1.1
*/
public static String asNumber(String number, String defaultNumber) {
if (number == null)
@@ -127,6 +126,7 @@ public static String asNumber(String number, String defaultNumber) {
*
* @param color the potential css color to filter
* @return the color specified or the string "invalid"
+ * @since 1.1
*/
public static String asCssColor(String color) {
return asCssColor(color, "invalid");
@@ -137,6 +137,7 @@ public static String asCssColor(String color) {
* @param color the potential css color to filter
* @param defaultColor a default String to return if the color argument is not a potentially valid CSS color
* @return a sanitised color or defaultColor if there is no conversion
+ * @since 1.1
*/
public static String asCssColor(String color, String defaultColor) {
if (color == null)
@@ -188,6 +189,7 @@ public static String asCssColor(String color, String defaultColor) {
*
* @param url The potentially tainted URL to be Filtered
* @return a safe version of the URL or <code>null</code> if <code>input</code> is null
+ * @since 1.1
*/
public static String asURL(String url) {
if (url == null) {
@@ -220,6 +222,7 @@ public static String asURL(String url) {
*
* @param url The potentially tainted URL to be Filtered
* @return a safe version of the URL or <code>null</code> if <code>input</code> is null
+ * @since 1.1
*/
public static String asFlexibleURL(String url) {
if (url == null) {
View
2 coverity-escapers/src/main/java/com/coverity/security/FilterEL.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2012, Coverity, Inc.
+ * Copyright (c) 2013, Coverity, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification,
View
8 pom.xml
@@ -46,6 +46,11 @@
<name>Jon Passki</name>
<email>jpasski@coverity.com</email>
</developer>
+ <developer>
+ <id>kuza55</id>
+ <name>Alex Kouzemtchenko</name>
+ <email>akouzemtchenko@coverity.com</email>
+ </developer>
</developers>
<properties>
@@ -62,6 +67,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
+ <configuration>
+ <javadocVersion>1.7</javadocVersion>
+ </configuration>
<executions>
<execution>
<id>attach-javadocs</id>

0 comments on commit d767931

Please sign in to comment.
Something went wrong with that request. Please try again.