From c136e80f79be280e159b323ca550d6f76978fc49 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 3 Aug 2017 01:58:45 +0200 Subject: [PATCH 1/4] set version to 0.8.1-dev --- CHANGELOG.md | 37 ++++++++++++++++++- docker/RELEASE/Dockerfile | 10 ++--- docker/RELEASE/README.md | 3 +- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- .../test_conf-default-algo/Dockerfile | 2 +- .../test_conf-env_debug/Dockerfile | 2 +- .../test_conf-piwik/Dockerfile | 2 +- .../pre-requisites_from-Ubuntu/Dockerfile | 2 +- documentation/pom.xml | 4 +- engine/api/pom.xml | 4 +- engine/hsv/pom.xml | 4 +- engine/impl/pom.xml | 4 +- engine/pom.xml | 4 +- engine/utils/pom.xml | 4 +- pom.xml | 2 +- webapp/pom.xml | 4 +- .../WEB-INF/template/template_variables.jspf | 2 +- 18 files changed, 64 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cb442ed..c9a44e38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,40 @@ # CHANGELOG -Contrast-Finder 0.8.0, 2017-08-xx --------------------------------------- +Contrast-Finder 0.8.1, 2017-08-xx +--------------------------------- + +Upgrade-o-meter: just replace the .war file and restart Tomcat + +### New Feature +none + +### Security +none + +### Outdated dependencies +none + +### Bug +none + +### Improvement +none + +### Refactoring +none + +### Configuration +none + +### Documentation +none + +### Task +none + + +Contrast-Finder 0.8.0, 2017-08-03 +--------------------------------- Upgrade-o-meter: just replace the .war file and restart Tomcat diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index f30ae4e5..a1ce86f2 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp" \ - org.label-schema.version = "0.8.0" \ + org.label-schema.version = "0.8.1-dev" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.0 . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.0/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.0/contrast-finder_0.8.0.i386.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.1-dev . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1-dev/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1-dev/contrast-finder_0.8.1-dev.i386.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.8.0" +ARG CONTRAST_FINDER_RELEASE="0.8.1-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/RELEASE/README.md b/docker/RELEASE/README.md index 7cd3e774..9abf00cb 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -7,7 +7,8 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra Supported tags and respective `Dockerfile` links : * [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile) -* [v0.8.0, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.8.1-dev, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile) * [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile) * [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile) diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 46183b26..0d223a0f 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.8.0" +ENV CONTRAST_FINDER_RELEASE="0.8.1-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 b403ef50..99ff34dd 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.8.0" +ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" # Add contrast-finder .war ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile index 79fbd912..e481d636 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.0" +ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile index c78d2685..40ee07a8 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.0" +ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile index 73b6ed8f..e6d92cc5 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.0" +ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile index 50cc59e0..6dd61d7a 100644 --- a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile +++ b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:14.04 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp pre-requisites" \ - org.label-schema.version = "0.8.0" \ + org.label-schema.version = "0.8.1-dev" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" # ----> documentation http://label-schema.org/ diff --git a/documentation/pom.xml b/documentation/pom.xml index 318fd15a..15273081 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.8.0 + 0.8.1-dev documentation pom - 0.8.0 + 0.8.1-dev contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 33b7b924..a61ca6aa 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.0 + 0.8.1-dev contrast-finder-api - 0.8.0 + 0.8.1-dev jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index 2ede4e51..e7b0879f 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.0 + 0.8.1-dev contrast-finder-hsv - 0.8.0 + 0.8.1-dev jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index cf7262ad..ed4d3148 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.0 + 0.8.1-dev contrast-finder-impl - 0.8.0 + 0.8.1-dev jar impl diff --git a/engine/pom.xml b/engine/pom.xml index 1602cc59..eb9c850b 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.0 + 0.8.1-dev engine - 0.8.0 + 0.8.1-dev pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index 7e347089..b32a2751 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.0 + 0.8.1-dev contrast-finder-utils - 0.8.0 + 0.8.1-dev jar utils diff --git a/pom.xml b/pom.xml index b3c22d22..c045b66f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.asqatasun contrast-finder pom - 0.8.0 + 0.8.1-dev Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index 942c5ac3..19c25616 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.0 + 0.8.1-dev webapp - 0.8.0 + 0.8.1-dev war contrast-finder-webapp diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index 7476cdd5..0b796093 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%> From 393ee971a302827182964788e41e1e0a10c8909a Mon Sep 17 00:00:00 2001 From: miname Date: Thu, 3 Aug 2017 12:53:50 +0900 Subject: [PATCH 2/4] Fix #88 - Add missing Korean translations with some minor corrections --- .../i18n/contrast-finder_utf8_ko.properties | 16 ++++++++-------- .../src/main/webapp/WEB-INF/template/header.jspf | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties b/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties index e91029fd..fc9d0cc8 100644 --- a/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties +++ b/webapp/src/main/resources/i18n/contrast-finder_utf8_ko.properties @@ -50,13 +50,13 @@ form.objectifs=검색 범위 form.algoHSV= 확장된 색 범위 속 기준에 적합한 대비 색 form.algoRGB=처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색 form.invalidColor=올바르지 않은 색 -form.changeComponent=try again changing the +form.changeComponent=교정 색의 조건을 다음과 같이 바꿔서 다시 시도해 봅시다. → form.invalidAlgo=알고리듬값이 올바르지 않습니다. form.tryHsv=좀 더 넓은 색 범위 안에서 대비 색 찾아보기 form.tryRgb=처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색 찾아보기 form.testedColors=개의 색이 검토됨 form.notSatisfied=만족스럽지 않으세요? -form.anyResult=Let's +form.anyResult=그럼 form.oppositeComponentForeground=배경 색 form.oppositeComponentBackground=본문 글자 색 message.addon=저기요! 혹시 저희 Contrast-Finder Firefox 부가 기능을 써보셨나요? @@ -67,10 +67,10 @@ footer.link-git=GitHub에 있는 Contrast-Finder에 기여하기 home.noResultTxt=

도움말

\

본문 글자 색

\

\ - 본문에 써진 글자에 칠해지는 색입니다. \ + 본문에 쓰인 글자에 입히는 색입니다. \ 이 항목에는 CSS 컬러 키워드, 16진법, 혹은 \ RGB 값을 입력하실 수 있습니다. \ - 입력한 값이 실제 색으로 변환된 모습은 항목 오른쪽에서 확인하실 수 있습니다. \ + 실제 변환된 색은 항목 오른쪽에서 미리 확인하실 수 있습니다. \

\

컬러 키워드

\

보기: Black, Silver, YellowGreen, MediumPurple.
\ @@ -134,8 +134,8 @@ home.noResultTxt=

도움말

\
  • WCAG 2.0 - MathML 버전의 상대 휘도 정의
    • \ \

    교정하려는 색

    \ -

    본문 글자 색 아니면 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.

    \ -

    선택하신 색은 나중에 기준에 적합한 색을 찾을 때까지 수정되며, 다른 색은 변하지 않습니다.

    \ +

    본문 글자 색 또는 배경색을 선택하실 수 있습니다. 기본은 본문 글자 색.

    \ +

    선택하신 색은 나중에 기준에 적합한 색을 찾을 때까지 수정되며, 나머지 색은 변하지 않습니다.

    \

    알고리듬

    \

    “처음 지정한 색과 아주 비슷하면서도 기준에 적합한 대비 색”

    \

    \ @@ -153,7 +153,7 @@ home.noResultTxt=

    도움말

    \ 하지만, 산출되는 색은 최초 지정 색과 (많이) 다를 수 있습니다. \

    \

    사용자 건의

    \ -

    Contrast-Finder를 사용하시면서 문제가 있거나 다른 문의 사항이 있으시다면, 연락해주시기 바랍니다:

    \ +

    Contrast-Finder를 사용하시면서 문제가 있거나 다른 문의 사항이 있으시면, 연락해주시기 바랍니다:

    \ \

    Contrast-Finder의 기능 개선 및 제안

    \

    \ - 모든 제안을 열렬히 환영합니다! \ + 어떠한 제안이든 모두 환영합니다! \ 번역, 문제 수정, 오류 보고, 새로운 기능…
    \ 부담없이 \ 소스 코드를 가지고 놀아보시고, \ diff --git a/webapp/src/main/webapp/WEB-INF/template/header.jspf b/webapp/src/main/webapp/WEB-INF/template/header.jspf index 936e0529..a0eafd42 100644 --- a/webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -79,7 +79,7 @@ 한국어 - 한국어 + 한국어 From b60a78ca2e9c2a608d9827010e31e640820410d4 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 5 Aug 2017 03:17:13 +0200 Subject: [PATCH 3/4] Fixed #90 Webapp - Used --- .../src/main/webapp/WEB-INF/template/head.jspf | 7 ++++++- .../WEB-INF/template/template_variables.jspf | 17 +++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/webapp/src/main/webapp/WEB-INF/template/head.jspf b/webapp/src/main/webapp/WEB-INF/template/head.jspf index 6b485937..7ffe391d 100644 --- a/webapp/src/main/webapp/WEB-INF/template/head.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/head.jspf @@ -27,9 +27,14 @@ - + + + + + + diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index 0b796093..f2e62a2a 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -22,14 +22,15 @@ <%-- Canonical URL --%> - - - - - - - - + + <%-- + + + + + + + --%> <%-- TITLE tag --%> From 79147b46613017103b67c949aab94483181b5c22 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 5 Aug 2017 12:15:25 +0200 Subject: [PATCH 4/4] set version to 0.8.1 --- CHANGELOG.md | 29 ++----------------- docker/RELEASE/Dockerfile | 10 +++---- docker/RELEASE/README.md | 2 +- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- .../test_conf-default-algo/Dockerfile | 2 +- .../test_conf-env_debug/Dockerfile | 2 +- .../test_conf-piwik/Dockerfile | 2 +- .../pre-requisites_from-Ubuntu/Dockerfile | 2 +- documentation/pom.xml | 4 +-- engine/api/pom.xml | 4 +-- engine/hsv/pom.xml | 4 +-- engine/impl/pom.xml | 4 +-- engine/pom.xml | 4 +-- engine/utils/pom.xml | 4 +-- pom.xml | 2 +- webapp/pom.xml | 4 +-- .../WEB-INF/template/template_variables.jspf | 2 +- 18 files changed, 31 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9a44e38..b020dd8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,36 +1,13 @@ # CHANGELOG -Contrast-Finder 0.8.1, 2017-08-xx +Contrast-Finder 0.8.1, 2017-08-05 --------------------------------- Upgrade-o-meter: just replace the .war file and restart Tomcat -### New Feature -none - -### Security -none - -### Outdated dependencies -none - -### Bug -none - ### Improvement -none - -### Refactoring -none - -### Configuration -none - -### Documentation -none - -### Task -none +- [#90 - Added ](https://github.com/Asqatasun/Contrast-Finder/issues/90) +- [#88 - Added missing Korean translations](https://github.com/Asqatasun/Contrast-Finder/issues/88) Contrast-Finder 0.8.0, 2017-08-03 diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index a1ce86f2..e006123f 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -1,7 +1,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp" \ - org.label-schema.version = "0.8.1-dev" \ + org.label-schema.version = "0.8.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" \ org.label-schema.docker.cmd = "docker run -p 8087:8080 -d asqatasun/contrast-finder" \ @@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.1-dev . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1-dev/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1-dev/contrast-finder_0.8.1-dev.i386.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.8.1 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.8.1/contrast-finder_0.8.1.i386.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1" ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.8.1-dev" +ARG CONTRAST_FINDER_RELEASE="0.8.1" 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/RELEASE/README.md b/docker/RELEASE/README.md index 9abf00cb..94badf7b 100644 --- a/docker/RELEASE/README.md +++ b/docker/RELEASE/README.md @@ -7,7 +7,7 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra Supported tags and respective `Dockerfile` links : * [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile) -* [v0.8.1-dev, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.8.1, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) * [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile) * [v0.7.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.7.0/docker/RELEASE/Dockerfile) * [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile) diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 0d223a0f..62134e0e 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.8.1-dev" +ENV CONTRAST_FINDER_RELEASE="0.8.1" 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 99ff34dd..c6dcc929 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.8.1-dev" +ENV CONTRAST_FINDER_RELEASE="0.8.1" # Add contrast-finder .war ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile index e481d636..7b0bfab0 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" +ENV CONTRAST_FINDER_RELEASE="0.8.1" ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="Rgb" # ENV CONF_DEFAULT_ALGO="HSV" diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile index 40ee07a8..9a5bf952 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" +ENV CONTRAST_FINDER_RELEASE="0.8.1" ENV CONF_ENV="debug" # Add contrast-finder .war diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile index e6d92cc5..36ba5911 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # environment variables -ENV CONTRAST_FINDER_RELEASE="0.8.1-dev" +ENV CONTRAST_FINDER_RELEASE="0.8.1" ENV PIWIK_KEY="9" ENV PIWIK_URL="http://localhost/piwik/" diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile index 6dd61d7a..d6bc2350 100644 --- a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile +++ b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:14.04 LABEL org.label-schema.schema-version = "1.0.0-rc.1" \ org.label-schema.name = "Contrast-Finder - WebApp pre-requisites" \ - org.label-schema.version = "0.8.1-dev" \ + org.label-schema.version = "0.8.1" \ org.label-schema.url = "https://contrast-finder.org" \ org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder" # ----> documentation http://label-schema.org/ diff --git a/documentation/pom.xml b/documentation/pom.xml index 15273081..0d059262 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.8.1-dev + 0.8.1 documentation pom - 0.8.1-dev + 0.8.1 contrast-finder-documentation diff --git a/engine/api/pom.xml b/engine/api/pom.xml index a61ca6aa..28a13ce2 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.1-dev + 0.8.1 contrast-finder-api - 0.8.1-dev + 0.8.1 jar api diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml index e7b0879f..f9668f71 100644 --- a/engine/hsv/pom.xml +++ b/engine/hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.1-dev + 0.8.1 contrast-finder-hsv - 0.8.1-dev + 0.8.1 jar hsv diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml index ed4d3148..08eff355 100644 --- a/engine/impl/pom.xml +++ b/engine/impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.1-dev + 0.8.1 contrast-finder-impl - 0.8.1-dev + 0.8.1 jar impl diff --git a/engine/pom.xml b/engine/pom.xml index eb9c850b..bf9329be 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.1-dev + 0.8.1 engine - 0.8.1-dev + 0.8.1 pom contrast-finder-engine diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml index b32a2751..2a5cff9d 100644 --- a/engine/utils/pom.xml +++ b/engine/utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun engine - 0.8.1-dev + 0.8.1 contrast-finder-utils - 0.8.1-dev + 0.8.1 jar utils diff --git a/pom.xml b/pom.xml index c045b66f..1f47e42b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.asqatasun contrast-finder pom - 0.8.1-dev + 0.8.1 Contrast-Finder diff --git a/webapp/pom.xml b/webapp/pom.xml index 19c25616..9ab72864 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.8.1-dev + 0.8.1 webapp - 0.8.1-dev + 0.8.1 war contrast-finder-webapp diff --git a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index f2e62a2a..68b4855d 100644 --- a/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%>