Contrast-Finder v0.4.2

---------------------- set version to 0.4.2 Updated CHANGELOG Fixed #16 - Changed JSTL artifact (jstl:jstl -> org.apache.taglibs:taglibs-standard-jstlel) Fixed #15 - Removed commons-httpclient dependency Fixed #14 - Upgraded SpringFrameworkt to v3.2.12 and remove spring-asm Fixed #13 - Upgraded Apache.HttpComponents HttpClient to v4.3.6 updated CONTRIBUTING.md fixed #11 - color contrast falling for links fixed #10 - color contrast failing for "the color should be between (...)" Dockerfile : typo set version to 0.4.2-dev
Asqatasun · Jan 15, 2017 · 3d2886b · 3d2886b
2 parents be59e70 + c7cb585
commit 3d2886b
Show file tree

Hide file tree

Showing 15 changed files with 115 additions and 58 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,30 @@
 
+Contrast-Finder 0.4.2, 2017-01-15
+---------------------------------
+
+Features:
+none
+
+Security:
+- [#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
+
+Documentation:
+none
+
+Upgrade-o-meter:
+just replace the .war file and restart Tomcat
+
+
 Contrast-Finder 0.4.1, 2017-01-12
 ---------------------------------
 
@@ -11,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
@@ -36,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

diff --git 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
+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.
diff --git 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,15 +49,14 @@ 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.
 
 
 ## License
 
- [AGPL v3](LICENSE) 
+ [AGPL v3](https://github.com/Asqatasun/Contrast-Finder/blob/master/LICENSE) 
 
 
 

diff --git 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</version>
     </parent>
 
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.4.1</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
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.4.1</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
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
-    <version>0.4.1</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
@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
   </parent>
   <artifactId>contrast-finder-resources</artifactId>
-  <version>0.4.1</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
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.1</version>
+        <version>0.4.2</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
     <packaging>jar</packaging>
     <name>contrast-finder-utils</name>
     <dependencies>
@@ -18,12 +18,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
+            <version>4.3.6</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

diff --git 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</version>
     </parent>
     <artifactId>contrast-finder-webapp</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2</version>
     <packaging>war</packaging>
 
     <name>contrast-finder-webapp</name>
@@ -34,46 +34,41 @@
             <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>
-            <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>

diff --git a/contrast-finder-webapp/src/main/webapp/Css/color-finder.css b/contrast-finder-webapp/src/main/webapp/Css/color-finder.css
@@ -4,12 +4,15 @@ body {
 }
 
 a {
-    color : #3173BD;
+    color : #3173BD;   /* AA  */
+    color : #0A52A4;   /* AAA */
 }
 
 /* Bootstrap override */ 
 .help-block {
     font-size : 12px;
+    color: #5A5A5A; /* AA */
+    color: #5A5151; /* AAA */
 }
 .alert-warning {
     color: #6c4a1e; 

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
@@ -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</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
@@ -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  .
+#   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
@@ -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>
@@ -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"
 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
@@ -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"
 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
@@ -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"
 
 # Add contrast-finder .war
 ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz  /root

diff --git 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</version>
     <name>contrast-finder</name>
     <modules>
         <module>contrast-finder-api</module>