Skip to content

Commit

Permalink
set version to 0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
dzc34 committed Jul 4, 2017
1 parent 9f7aba6 commit 3fce46e
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 38 deletions.
11 changes: 1 addition & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
# CHANGELOG

Contrast-Finder 0.5.2, 2017-xx-xx
Contrast-Finder 0.5.2, 2017-07-04
---------------------------------

Upgrade-o-meter: just replace the .war file and restart Tomcat

### New Feature
none

### Security
- [#70 - Upgraded commons-lang3: 3.6 instead of 3.5](https://github.com/Asqatasun/Contrast-Finder/issues/70)

Expand All @@ -22,12 +19,6 @@ none
### Refactoring
- [#75 - Remove unused dependencies: httpclient + json](https://github.com/Asqatasun/Contrast-Finder/issues/75)

### Configuration
none

### Documentation
none

### Task
- [#68 - tar.gz - Changelog and readme files in html format](https://github.com/Asqatasun/Contrast-Finder/issues/68)
- [#69 - tar.gz - Documentation files in html format](https://github.com/Asqatasun/Contrast-Finder/issues/69)
Expand Down
10 changes: 5 additions & 5 deletions docker/RELEASE/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.5.2-dev" \
org.label-schema.version = "0.5.2" \
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" \
Expand All @@ -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.5.2-dev .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.2-dev/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.2-dev/contrast-finder_0.5.2-dev.i386.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.5.2 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.2/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.2/contrast-finder_0.5.2.i386.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.5.2-dev"
ARG CONTRAST_FINDER_RELEASE="0.5.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"

Expand Down
2 changes: 1 addition & 1 deletion docker/RELEASE/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.2-dev, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
* [v0.5.2, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
* [v0.5.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.1/docker/RELEASE/Dockerfile)
* [v0.5.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.0/docker/RELEASE/Dockerfile)
* [v0.4.7](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.7/docker/RELEASE/Dockerfile)
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local_from-Tomcat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.5.2-dev"
ENV CONTRAST_FINDER_RELEASE="0.5.2"
ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"

# Prepare Contrast-Finder
Expand Down
2 changes: 1 addition & 1 deletion docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.5.2-dev"
ENV CONTRAST_FINDER_RELEASE="0.5.2"

# Add contrast-finder .war
ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.5.2-dev"
ENV CONTRAST_FINDER_RELEASE="0.5.2"
ENV CONF_DEFAULT_ALGO="Rgb"
# ENV CONF_DEFAULT_ALGO="Rgb"
# ENV CONF_DEFAULT_ALGO="HSV"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.5.2-dev"
ENV CONTRAST_FINDER_RELEASE="0.5.2"
ENV CONF_ENV="debug"

# Add contrast-finder .war
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
###################################################################

# environment variables
ENV CONTRAST_FINDER_RELEASE="0.5.2-dev"
ENV CONTRAST_FINDER_RELEASE="0.5.2"
ENV PIWIK_KEY="9"
ENV PIWIK_URL="http://localhost/piwik/"

Expand Down
Original file line number Diff line number Diff line change
@@ -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.5.2-dev" \
org.label-schema.version = "0.5.2" \
org.label-schema.url = "https://contrast-finder.org" \
org.label-schema.vcs-url = "https://github.com/Asqatasun/Contrast-Finder"
# ----> documentation http://label-schema.org/
Expand Down
4 changes: 2 additions & 2 deletions documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>contrast-finder</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>documentation</artifactId>
<packaging>pom</packaging>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<name>contrast-finder-documentation</name>
<licenses>
<license>
Expand Down
4 changes: 2 additions & 2 deletions engine/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>engine</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>contrast-finder-api</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<packaging>jar</packaging>
<name>api</name>
<licenses>
Expand Down
4 changes: 2 additions & 2 deletions engine/hsv/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>engine</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>contrast-finder-hsv</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<packaging>jar</packaging>
<name>hsv</name>
<licenses>
Expand Down
4 changes: 2 additions & 2 deletions engine/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>engine</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>contrast-finder-impl</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<packaging>jar</packaging>
<name>impl</name>
<licenses>
Expand Down
4 changes: 2 additions & 2 deletions engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>contrast-finder</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>engine</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<packaging>pom</packaging>
<name>contrast-finder-engine</name>
<licenses>
Expand Down
4 changes: 2 additions & 2 deletions engine/utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>engine</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>contrast-finder-utils</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<packaging>jar</packaging>
<name>utils</name>
<licenses>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.asqatasun</groupId>
<artifactId>contrast-finder</artifactId>
<packaging>pom</packaging>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<name>Contrast-Finder</name>
<licenses>
<license>
Expand Down
4 changes: 2 additions & 2 deletions webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>contrast-finder</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
</parent>
<artifactId>webapp</artifactId>
<version>0.5.2-dev</version>
<version>0.5.2</version>
<packaging>war</packaging>
<name>contrast-finder-webapp</name>
<licenses>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%@ page pageEncoding="UTF-8" %>

<%-- APP version --%>
<c:set var="appVersion" value="0.5.2-dev"/>
<c:set var="appVersion" value="0.5.2"/>

<%-- APP Name --%>
<c:set var="appName" value="Contrast-Finder"/>
Expand Down

0 comments on commit 3fce46e

Please sign in to comment.