From c136e80f79be280e159b323ca550d6f76978fc49 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 3 Aug 2017 01:58:45 +0200 Subject: [PATCH] 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 --%>