From 769c3606905b408aa45648afa22f286c71844788 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Thu, 12 Jan 2017 23:18:58 +0100
Subject: [PATCH 01/11] set version to 0.4.2-dev

---
 CHANGELOG.md                                  | 22 +++++++++++++++++++
 contrast-finder-api/pom.xml                   |  4 ++--
 contrast-finder-hsv/pom.xml                   |  4 ++--
 contrast-finder-impl/pom.xml                  |  4 ++--
 contrast-finder-resources/pom.xml             |  4 ++--
 contrast-finder-utils/pom.xml                 |  4 ++--
 contrast-finder-webapp/pom.xml                |  4 ++--
 .../main/webapp/WEB-INF/template/footer.jspf  |  2 +-
 docker/RELEASE/Dockerfile                     |  8 +++----
 docker/SNAPSHOT-local_from-Tomcat/Dockerfile  |  2 +-
 docker/SNAPSHOT-local_from-Ubuntu/Dockerfile  |  2 +-
 pom.xml                                       |  2 +-
 12 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f02c0352..d0ea30b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,26 @@
 
+Contrast-Finder 0.4.x, 2017-xx-xx
+---------------------------------
+
+Features:
+None
+
+Security:
+None
+
+Bugs:
+None
+
+Configuration:
+None
+
+Documentation:
+None
+
+Upgrade-o-meter:
+None
+
+
 Contrast-Finder 0.4.1, 2017-01-12
 ---------------------------------
 
diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml
index e36b2305..eeb7a0fc 100644
--- a/contrast-finder-api/pom.xml
+++ b/contrast-finder-api/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2-dev</version>
     </parent>
 
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
     <packaging>jar</packaging>
     <name>contrast-finder-api</name>
 
diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml
index c9797dd8..02894a5e 100644
--- a/contrast-finder-hsv/pom.xml
+++ b/contrast-finder-hsv/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2-dev</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
     <packaging>jar</packaging>
     <name>contrast-finder-hsv</name>
     <build>
diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml
index 1622c5c3..433f35a0 100644
--- a/contrast-finder-impl/pom.xml
+++ b/contrast-finder-impl/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2-dev</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
     <packaging>jar</packaging>
     <name>contrast-finder-impl</name>
     <dependencies>
diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml
index 8474cbea..b2c14b38 100644
--- a/contrast-finder-resources/pom.xml
+++ b/contrast-finder-resources/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
   </parent>
   <artifactId>contrast-finder-resources</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-dev</version>
   <name>contrast-finder-resources</name>
   <url>http://maven.apache.org</url>
   <properties>
diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml
index 3acf3b81..c86f2913 100644
--- a/contrast-finder-utils/pom.xml
+++ b/contrast-finder-utils/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2-dev</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
     <packaging>jar</packaging>
     <name>contrast-finder-utils</name>
     <dependencies>
diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml
index 6e16af93..57025607 100644
--- a/contrast-finder-webapp/pom.xml
+++ b/contrast-finder-webapp/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2-dev</version>
     </parent>
     <artifactId>contrast-finder-webapp</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
     <packaging>war</packaging>
 
     <name>contrast-finder-webapp</name>
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
index cb64d6c4..ca523281 100644
--- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
+++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
@@ -8,7 +8,7 @@
     </div>
     <p id="footer-copyright">
         <fmt:message key="footer.poweredBy"/>
-        <a href="https://github.com/Asqatasun/Contrast-Finder/releases/"><em>Contrast Finder</em> v0.4.1</a>,
+        <a href="https://github.com/Asqatasun/Contrast-Finder/releases/"><em>Contrast Finder</em> v0.4.2-dev</a>,
         <fmt:message key="footer.availableUnder"/>
         <a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU AGPL v3</a>
         <br><br>
diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile
index 195655d6..9e9633ce 100644
--- a/docker/RELEASE/Dockerfile
+++ b/docker/RELEASE/Dockerfile
@@ -4,9 +4,9 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 #
 #   --- Building this docker image
 #   docker build -t asqatasun/contrast-finder  .
-#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.4.1  .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.1/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.1/contrast-finder-webapp-0.4.1.war   .
+#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.4.2-dev  .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/contrast-finder-webapp-0.4.2-dev.war   .
 #
 #   --- Launch a container
 #   docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
@@ -27,7 +27,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # build variables
-ARG CONTRAST_FINDER_RELEASE="0.4.1"
+ARG CONTRAST_FINDER_RELEASE="0.4.2-dev"
 ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}"
 ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz"
 
diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
index e513a39a..28cea6cc 100644
--- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
+++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
@@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.4.1"
+ENV CONTRAST_FINDER_RELEASE="0.4.2-dev"
 ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"
 
 # Prepare Contrast-Finder
diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
index fd33fd78..9ba187ea 100644
--- a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
+++ b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.4.1"
+ENV CONTRAST_FINDER_RELEASE="0.4.2-dev"
 
 # Add contrast-finder .war
 ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz  /root
diff --git a/pom.xml b/pom.xml
index 42728df2..9773a3a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
     <packaging>pom</packaging>
-    <version>0.4.1</version>
+    <version>0.4.2-dev</version>
     <name>contrast-finder</name>
     <modules>
         <module>contrast-finder-api</module>

From d053520ac94771a35504db595c3cc4ac73ddb8e6 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Thu, 12 Jan 2017 23:13:30 +0100
Subject: [PATCH 02/11] Dockerfile : typo

---
 docker/RELEASE/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile
index 9e9633ce..a098bab5 100644
--- a/docker/RELEASE/Dockerfile
+++ b/docker/RELEASE/Dockerfile
@@ -6,7 +6,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 #   docker build -t asqatasun/contrast-finder  .
 #   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.4.2-dev  .
 #   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/contrast-finder-webapp-0.4.2-dev.war   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/contrast-finder_0.4.2.i386.tar.gz   .
 #
 #   --- Launch a container
 #   docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
@@ -16,7 +16,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 #   docker logs -f contrast.finder
 #
 # #### source code  ###############################################
-#   https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder-webapp-${CONTRAST_FINDER_RELEASE}.war
+#   https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz
 #     could be overridden with  --build-arg CONTRAST_FINDER_RELEASE=<release>
 #     could be overridden with  --build-arg SRC_URL_PREFIX=<url_prefix>
 #     could be overridden with  --build-arg SRC_URL=<url>

From 781ae9bba4a58f0ca890bb4a24742b60fd2f10ee Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 14 Jan 2017 18:05:12 +0100
Subject: [PATCH 03/11] fixed #10 - color contrast failing for "the color
 should be between (...)"

RGAA 3.3.1  AA
---
 contrast-finder-webapp/src/main/webapp/Css/color-finder.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrast-finder-webapp/src/main/webapp/Css/color-finder.css b/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
index eb1bf689..b7603690 100644
--- a/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
+++ b/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
@@ -10,6 +10,8 @@ a {
 /* Bootstrap override */ 
 .help-block {
     font-size : 12px;
+    color: #5A5A5A; /* AA */
+    color: #5A5151; /* AAA */
 }
 .alert-warning {
     color: #6c4a1e; 

From 0b24ec28ad3f2341814d0e88a512526982d78226 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 14 Jan 2017 18:18:46 +0100
Subject: [PATCH 04/11] fixed #11 - color contrast falling for links

RGAA 3.4.1  AAA
---
 contrast-finder-webapp/src/main/webapp/Css/color-finder.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrast-finder-webapp/src/main/webapp/Css/color-finder.css b/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
index b7603690..0b3b8bae 100644
--- a/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
+++ b/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
@@ -4,7 +4,8 @@ body {
 }
 
 a {
-    color : #3173BD;
+    color : #3173BD;   /* AA  */
+    color : #0A52A4;   /* AAA */
 }
 
 /* Bootstrap override */ 

From ab16a71b6cf665f725c6e76f150041d051916e5d Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 14 Jan 2017 19:09:24 +0100
Subject: [PATCH 05/11] updated CONTRIBUTING.md

---
 CHANGELOG.md    |  3 ++-
 CONTRIBUTING.md | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
 README.md       |  9 ++++-----
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0ea30b1..11ac46e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,8 @@ Security:
 None
 
 Bugs:
-None
+- [#10 Webapp - Color contrast falling for links](https://github.com/Asqatasun/Contrast-Finder/issues/10)
+- [#11 Webapp - Color contrast failing for "the color should be between (…)"](https://github.com/Asqatasun/Contrast-Finder/issues/11)
 
 Configuration:
 None
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ba1297d6..06ea3ff6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +1,49 @@
-# Contributing to Asqatasun-Contrast-Finder
+# Contributing to Contrast-Finder
 
 :+1: First off, thanks for taking the time to contribute! :+1:
 
-
+We are really glad to have you on board ! 
 You can help in many ways:
 
-* [Fill in a bug report](https://github.com/Asqatasun/Contrast-Finder/issues)
-* [Help translate Asqatasun-Contrast-Finder](#) @@@TODO Transifex URL
-* [Pull Requests](https://github.com/Asqatasun/Contrast-Finder/pulls) are off course welcome
\ No newline at end of file
+1. Use Contrast-Finder !
+1. Help translate Contrast-Finder
+1. Give us [feedback on the forum](http://forum.asqatasun.org) or [fill in bug report](https://github.com/Asqatasun/Contrast-Finder/issues)
+
+[Pull Requests](https://github.com/Asqatasun/Contrast-Finder/pulls) are always welcome! 
+
+
+## Fill in bug reports
+
+[Fill in a bug report](https://github.com/Asqatasun/Contrast-Finder/issues)
+
+* Please do not assign issue to anyone.
+* You may assign an issue to yourself, meaning to others "I'm actually working on this issue".
+* When closing an issue, please *always* add a comment explaining why you are closing it.
+
+
+## Contribution to the code / Pull Request
+
+Please always work on `develop` branch. 
+
+`Master` is meant to be directly usable in production,
+thus only contains tagged releases.
+
+### Builds and runs a Docker container
+
+- builds Contrast-Finder from sources,
+- builds a Docker image
+- runs a container based the freshly built image
+
+```bash
+git clone https://github.com/Asqatasun/Contrast-Finder
+cd Contrast-finder
+git checkout develop
+docker/compile_and_build_docker_image.sh -l -s ${PWD} -d docker/SNAPSHOT-local_from-Ubuntu
+```
+
+
+
+## Sources of inspiration for CONTRIBUTING.md
+
+* For contributors doc [Gitlab Workflow](https://about.gitlab.com/handbook/#gitlab-workflow)
+* [Atom's Contributing file](https://github.com/atom/atom/blob/master/CONTRIBUTING.md) that is really good and brightly written.
\ No newline at end of file
diff --git a/README.md b/README.md
index c263d678..820162e7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![License : AGPL v3](https://img.shields.io/badge/License-AGPL3-blue.svg)](LICENSE) 
+[![License : AGPL v3](https://img.shields.io/badge/License-AGPL3-blue.svg)](https://github.com/Asqatasun/Contrast-Finder/blob/master/LICENSE) 
 [![Release](https://img.shields.io/github/release/asqatasun/Contrast-Finder.svg)](https://github.com/Asqatasun/Contrast-Finder/releases/latest)
 [![Build Status](https://travis-ci.org/Asqatasun/Contrast-Finder.svg)](https://travis-ci.org/Asqatasun/Contrast-Finder)
 
@@ -28,10 +28,10 @@ That's the purpose of [Contrast-Finder.org](https://contrast-finder.org/)
 
 ## Documentation
 How to build, install and use ? 
-Go to the [documentation](documentation/en/) !
+Go to the [documentation](https://github.com/Asqatasun/Contrast-Finder/blob/master/documentation/en/) !
 
 ## Screenshots
-![Screenshot - Contrast-Finder v0.3.5](documentation/en/images/screenshot.EN_contrast-finder.v0.3.5_2016-12-19.png)
+![Screenshot - Contrast-Finder v0.3.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/documentation/en/images/screenshot.EN_contrast-finder.v0.3.5_2016-12-19.png)
 
 
 ---
@@ -49,7 +49,6 @@ We would be really glad to have you on board! You can help in many ways:
 1. Use Contrast-Finder !
 1. Help translate Contrast-Finder
 1. Give us [feedback on the forum](http://forum.asqatasun.org) or [fill in bug report](https://github.com/Asqatasun/Contrast-Finder/issues)
-1. Help us in improving the SEO rules: come, code or [discuss](http://forum.asqatasun.org/c/english)!
 
 [Pull Requests](https://github.com/Asqatasun/Contrast-Finder/pulls) are always welcome! 
 Everything is summarized in the [CONTRIBUTING](https://github.com/Asqatasun/Contrast-Finder/blob/master/CONTRIBUTING.md) file.
@@ -57,7 +56,7 @@ Everything is summarized in the [CONTRIBUTING](https://github.com/Asqatasun/Cont
 
 ## License
 
- [AGPL v3](LICENSE) 
+ [AGPL v3](https://github.com/Asqatasun/Contrast-Finder/blob/master/LICENSE) 
 
 
 

From 0b692136cf1df2442d23f4d291db15f4e2883187 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 14 Jan 2017 22:20:14 +0100
Subject: [PATCH 06/11] Fixed #13 - Upgraded Apache.HttpComponents HttpClient
 to v4.3.6

HttpComponents HttpClient before 4.3.5 has a CVSS 5.8 vulnerability
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3577

HttpComponents HttpClient before 4.3.6 has a CVSS 4.3 vulnerability
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-5262
---
 contrast-finder-utils/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml
index c86f2913..db598914 100644
--- a/contrast-finder-utils/pom.xml
+++ b/contrast-finder-utils/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.3.1</version>
+            <version>4.3.6</version>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>

From 2990623b857cd5f82beb4a2d0a96ffad5b77b0f1 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 14 Jan 2017 22:52:24 +0100
Subject: [PATCH 07/11] Fixed #14 - Upgraded SpringFrameworkt to v3.2.12 and
 remove spring-asm

- [cpe:/a:springsource:spring_framework:3.1.2](https://web.nvd.nist.gov/view/vuln/search-results?adv_search=true&cves=on&cpe_version=cpe%3A%2Fa%3Aspringsource%3Aspring_framework%3A3.1.2)
- [cpe:/a:pivotal:spring_framework:3.1.2](https://web.nvd.nist.gov/view/vuln/search-results?adv_search=true&cves=on&cpe_version=cpe%3A%2Fa%3Apivotal%3Aspring_framework%3A3.1.2)

The SourceHttpMessageConverter in Spring MVC in Spring Framework before 3.2.5
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-6429

The Spring MVC in Spring Framework before 3.2.4
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-7315

The Spring OXM wrapper in Spring Framework before 3.2.4
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4152

The Jaxb2RootElementHttpMessageConverter in Spring MVC in Spring Framework before 3.2.8
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-0054

Cross-site scripting (XSS) vulnerability in web/servlet/tags/form/FormTag.java in Spring MVC in Spring Framework 3.0.0 before 3.2.8
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1904

Directory traversal vulnerability in Spring Framework 3.x before 3.2.9
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3578

Directory traversal vulnerability in Spring Framework 3.0.4 through 3.2.x **before 3.2.12**
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3625

```
         <dependency>
             <groupId>org.springframework</groupId>
             (...)
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
         </dependency>

-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-asm</artifactId>
-            <version>3.1.2.RELEASE</version>
-        </dependency>

```

> from release notes for 3.2 :
> "we've eliminated the dedicated spring-asm jar in M2 in favor of including org.springframework.asm classes directly in spring-core"
> - http://stackoverflow.com/questions/19800004/why-is-there-no-spring-asm-3-2-4-release-jar
> - https://spring.io/blog/2012/09/12/spring-framework-3-2-m2-released"
>
> "In Spring Framework 3.2, spring-asm is upgraded to org.objectweb.asm 4.0 and included in spring-core. Now there is no need to add this spring-asm dependency." [source](http://www.srccodes.com/p/article/29/spring-asm-dependency-issue-incompatibleclasschangeerror-classmetadatareadingvisitor-classvisitor)
---
 contrast-finder-webapp/pom.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml
index 57025607..00f33465 100644
--- a/contrast-finder-webapp/pom.xml
+++ b/contrast-finder-webapp/pom.xml
@@ -34,41 +34,36 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-asm</artifactId>
-            <version>3.1.2.RELEASE</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-expression</artifactId>
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
-            <version>3.1.2.RELEASE</version>
+            <version>3.2.12.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>jstl</groupId>

From 7255f737aa1788b6e554f85c780410265de54542 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sat, 14 Jan 2017 23:09:23 +0100
Subject: [PATCH 08/11] Fixed #15 - Removed commons-httpclient dependency

in Apache Commons HttpClient before 4.2.3
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-6153

"The Commons HttpClient project is now end of life, and is no longer being developed. It has been replaced by the Apache HttpComponents project in its HttpClient and HttpCore modules, which offer better performance and more flexibility. "  http://hc.apache.org/httpclient-3.x/

"The Commons HttpClient project used to be a part of Commons, but is now part of Apache HttpComponents" http://commons.apache.org/
---
 contrast-finder-utils/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml
index db598914..65fbdb43 100644
--- a/contrast-finder-utils/pom.xml
+++ b/contrast-finder-utils/pom.xml
@@ -20,11 +20,6 @@
             <artifactId>httpclient</artifactId>
             <version>4.3.6</version>
         </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>

From ded2ad3414bba0d98da84bd385907372c1504146 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sun, 15 Jan 2017 02:11:45 +0100
Subject: [PATCH 09/11] Fixed #16 - Changed JSTL artifact (jstl:jstl ->
 org.apache.taglibs:taglibs-standard-jstlel)

Vulnerability
Apache Standard Taglibs before 1.2.3 has a CVSS 7.5 vulnerability
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-0254

see all version of jstl (latest version: 12-May-2006)
http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22jstl%22%20AND%20a%3A%22jstl%22

Solution
Changed JSTL artifact (jstl:jstl -> org.apache.taglibs:taglibs-standard-jstlel)
https://tomcat.apache.org/taglibs/standard/
---
 contrast-finder-webapp/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml
index 00f33465..adf89108 100644
--- a/contrast-finder-webapp/pom.xml
+++ b/contrast-finder-webapp/pom.xml
@@ -66,9 +66,9 @@
             <version>3.2.12.RELEASE</version>
         </dependency>
         <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <groupId>org.apache.taglibs</groupId>
+            <artifactId>taglibs-standard-jstlel</artifactId>
+            <version>1.2.5</version>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

From 99ba91a1842e807f1901ed7115668033dbe7134f Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sun, 15 Jan 2017 02:32:38 +0100
Subject: [PATCH 10/11] Updated CHANGELOG

---
 CHANGELOG.md | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11ac46e5..5193cb85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,23 +3,26 @@ Contrast-Finder 0.4.x, 2017-xx-xx
 ---------------------------------
 
 Features:
-None
+none
 
 Security:
-None
+- [#13 - Upgraded Apache.HttpComponents HttpClient to v4.3.6](https://github.com/Asqatasun/Contrast-Finder/issues/13)
+- [#14 - Upgraded SpringFrameworkt to v3.2.12 and remove spring-asm](https://github.com/Asqatasun/Contrast-Finder/issues/14)
+- [#15 - Removed commons-httpclient dependency](https://github.com/Asqatasun/Contrast-Finder/issues/15)
+- [#16 - Changed JSTL artifact : jstl --> taglibs-standard-jstlel](https://github.com/Asqatasun/Contrast-Finder/issues/16)
 
 Bugs:
 - [#10 Webapp - Color contrast falling for links](https://github.com/Asqatasun/Contrast-Finder/issues/10)
 - [#11 Webapp - Color contrast failing for "the color should be between (…)"](https://github.com/Asqatasun/Contrast-Finder/issues/11)
 
 Configuration:
-None
+none
 
 Documentation:
-None
+none
 
 Upgrade-o-meter:
-None
+just replace the .war file and restart Tomcat
 
 
 Contrast-Finder 0.4.1, 2017-01-12
@@ -34,13 +37,13 @@ Security:
 - [#9 Webapp - Don't expose session ID in the URL](https://github.com/Asqatasun/Contrast-Finder/issues/9)
 
 Bugs:
-None
+none
 
 Configuration:
-None
+none
 
 Documentation:
-None
+none
 
 Upgrade-o-meter:
 just replace the .war file and restart Tomcat
@@ -59,13 +62,13 @@ Security:
 - [#1 Upgrade Apache Commons Collections to v3.2.2](https://github.com/Asqatasun/Contrast-Finder/issues/1)
 
 Bugs:
-None
+none
 
 Configuration:
-None
+none
 
 Documentation:
-None
+none
 
 
 Contrast-Finder 0.3.5, 2016-12-18

From c7cb5859fe9c9826064607b6d7713eac7f76c793 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sun, 15 Jan 2017 02:40:10 +0100
Subject: [PATCH 11/11] set version to 0.4.2

---
 CHANGELOG.md                                              | 2 +-
 contrast-finder-api/pom.xml                               | 4 ++--
 contrast-finder-hsv/pom.xml                               | 4 ++--
 contrast-finder-impl/pom.xml                              | 4 ++--
 contrast-finder-resources/pom.xml                         | 4 ++--
 contrast-finder-utils/pom.xml                             | 4 ++--
 contrast-finder-webapp/pom.xml                            | 4 ++--
 .../src/main/webapp/WEB-INF/template/footer.jspf          | 2 +-
 docker/RELEASE/Dockerfile                                 | 8 ++++----
 docker/SNAPSHOT-local_from-Tomcat/Dockerfile              | 2 +-
 docker/SNAPSHOT-local_from-Ubuntu/Dockerfile              | 2 +-
 pom.xml                                                   | 2 +-
 12 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5193cb85..c94431e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 
-Contrast-Finder 0.4.x, 2017-xx-xx
+Contrast-Finder 0.4.2, 2017-01-15
 ---------------------------------
 
 Features:
diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml
index eeb7a0fc..281d1662 100644
--- a/contrast-finder-api/pom.xml
+++ b/contrast-finder-api/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.2-dev</version>
+        <version>0.4.2</version>
     </parent>
 
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <name>contrast-finder-api</name>
 
diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml
index 02894a5e..76193501 100644
--- a/contrast-finder-hsv/pom.xml
+++ b/contrast-finder-hsv/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.2-dev</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <name>contrast-finder-hsv</name>
     <build>
diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml
index 433f35a0..189144c1 100644
--- a/contrast-finder-impl/pom.xml
+++ b/contrast-finder-impl/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.2-dev</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <name>contrast-finder-impl</name>
     <dependencies>
diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml
index b2c14b38..e24e6a90 100644
--- a/contrast-finder-resources/pom.xml
+++ b/contrast-finder-resources/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
   </parent>
   <artifactId>contrast-finder-resources</artifactId>
-  <version>0.4.2-dev</version>
+  <version>0.4.2</version>
   <name>contrast-finder-resources</name>
   <url>http://maven.apache.org</url>
   <properties>
diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml
index 65fbdb43..05308aef 100644
--- a/contrast-finder-utils/pom.xml
+++ b/contrast-finder-utils/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.2-dev</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <name>contrast-finder-utils</name>
     <dependencies>
diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml
index adf89108..df376307 100644
--- a/contrast-finder-webapp/pom.xml
+++ b/contrast-finder-webapp/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.2-dev</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-webapp</artifactId>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
     <packaging>war</packaging>
 
     <name>contrast-finder-webapp</name>
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
index ca523281..8afa2970 100644
--- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
+++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf
@@ -8,7 +8,7 @@
     </div>
     <p id="footer-copyright">
         <fmt:message key="footer.poweredBy"/>
-        <a href="https://github.com/Asqatasun/Contrast-Finder/releases/"><em>Contrast Finder</em> v0.4.2-dev</a>,
+        <a href="https://github.com/Asqatasun/Contrast-Finder/releases/"><em>Contrast Finder</em> v0.4.2</a>,
         <fmt:message key="footer.availableUnder"/>
         <a href="http://www.gnu.org/licenses/agpl-3.0.html">GNU AGPL v3</a>
         <br><br>
diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile
index a098bab5..98681564 100644
--- a/docker/RELEASE/Dockerfile
+++ b/docker/RELEASE/Dockerfile
@@ -4,9 +4,9 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 #
 #   --- Building this docker image
 #   docker build -t asqatasun/contrast-finder  .
-#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.4.2-dev  .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2-dev/contrast-finder_0.4.2.i386.tar.gz   .
+#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.4.2  .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2/   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.2/contrast-finder_0.4.2.i386.tar.gz   .
 #
 #   --- Launch a container
 #   docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
@@ -27,7 +27,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # build variables
-ARG CONTRAST_FINDER_RELEASE="0.4.2-dev"
+ARG CONTRAST_FINDER_RELEASE="0.4.2"
 ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}"
 ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz"
 
diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
index 28cea6cc..8b993f19 100644
--- a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
+++ b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
@@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.4.2-dev"
+ENV CONTRAST_FINDER_RELEASE="0.4.2"
 ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"
 
 # Prepare Contrast-Finder
diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
index 9ba187ea..f86f71a8 100644
--- a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
+++ b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.4.2-dev"
+ENV CONTRAST_FINDER_RELEASE="0.4.2"
 
 # Add contrast-finder .war
 ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz  /root
diff --git a/pom.xml b/pom.xml
index 9773a3a3..7c315646 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
     <packaging>pom</packaging>
-    <version>0.4.2-dev</version>
+    <version>0.4.2</version>
     <name>contrast-finder</name>
     <modules>
         <module>contrast-finder-api</module>