Merge branch 'master' of ssh://github.com/OWASP/java-html-sanitizer

Author: mikesamuel

aggregate/pom.xml

@@ -3,12 +3,12 @@
   <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
   <artifactId>aggregate</artifactId>
   <packaging>pom</packaging>
-  <version>20160422.2-SNAPSHOT</version>
+  <version>20160526.2-SNAPSHOT</version>
   <parent>
     <relativePath>../parent</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
-    <version>20160422.2-SNAPSHOT</version>
+    <version>20160526.2-SNAPSHOT</version>
   </parent>
 
   <modules>

change_log.md

@@ -2,6 +2,10 @@
 
 Most recent at top.
 
+  * Release 20160526.1
+    * Added support for pre-processors and post-processors so that there
+      is no need for clients to do textual search/replace on the
+      untrusted input or the trusted output.
   * Release 20160413.1
     * Integrated support for Safe HTML Types and the Fences enforcer to allow
       the sanitizer to produce safe-contract-types.

html-types/pom.xml

@@ -2,13 +2,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
   <artifactId>html-types</artifactId>
-  <version>20160422.2-SNAPSHOT</version>
+  <version>20160526.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
     <relativePath>../parent</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
-    <version>20160422.2-SNAPSHOT</version>
+    <version>20160526.2-SNAPSHOT</version>
   </parent>
 
   <name>OWASP Java HTML Sanitizer Safe HTML Compatibility</name>

parent/pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
   <artifactId>parent</artifactId>
-  <version>20160422.2-SNAPSHOT</version>
+  <version>20160526.2-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 

pom.xml

@@ -6,7 +6,7 @@
     <relativePath>parent</relativePath>
     <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
     <artifactId>parent</artifactId>
-    <version>20160422.2-SNAPSHOT</version>
+    <version>20160526.2-SNAPSHOT</version>
   </parent>
 
   <name>OWASP Java HTML Sanitizer</name>