Skip to content

Commit

Permalink
Contrast-Finder v0.9.2
Browse files Browse the repository at this point in the history
----------------------

  set version to 0.9.2
  Updating screenshots
  removed unused css file (van11y accessible modal)
  removed unused js file (van11y accessible modal)
  fixed some  Codacy issues (js, java)
  typo
  fixed #178 / fixed #179
  transform debian package documentation into markdown file
  typo
  fixed #172
  #172 - All maven plugins have their version specified (except maven-assembly-plugin)
  Revert "fixed #172 - All maven plugins have their version specified (except maven-assembly-plugin)"
  Upgraded dependencies
  fixed #172 - All maven plugins have their version specified (except maven-assembly-plugin)
  Doc > Contributor > QA tools - Added "Image Analysis Tool"
  Upgraded dependencies - Fixed #167 / Fixed #168 / Fixe d #169 / Fixed #170
  #166 - Disabled maven-site-plugin for debian_package
  clean #166
  Fixed #166 - Use an independent subproject for jdeb (debian packages creation)
  Webapp - Added humans.txt file
  Fixed #165 - Added some information to the MANIFEST.MF files : commit, buid timestamp
  Fixed #162 / Fixed #163 / Fixed #164
  set version to 0.9.2-SNAPSHOT
  • Loading branch information
dzc34 committed Sep 2, 2018
2 parents 917f7e8 + 84b329f commit 294ad1d
Show file tree
Hide file tree
Showing 76 changed files with 940 additions and 961 deletions.
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,38 @@
# CHANGELOG

Contrast-Finder 0.9.2, 2018-09-03
---------------------------------

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

### Outdated dependencies
- [#163 - Upgraded SpringFramework (4.3.18 instead of 4.3.17)](https://github.com/Asqatasun/Contrast-Finder/issues/163)
- [#162 - Upgraded spring--security (4.2.7 instead of 4.2.6)](https://github.com/Asqatasun/Contrast-Finder/issues/162)
- [#176 - Upgraded commons-collections4 (4.2 instead of 4.1)](https://github.com/Asqatasun/Contrast-Finder/issues/176)
- [#177 - Upgraded commons-lang3 (3.8 instead of 3.7)](https://github.com/Asqatasun/Contrast-Finder/issues/177)
- [#167 - Upgraded maven-javadoc-plugin (3.0.1 instead of 3.0.0)](https://github.com/Asqatasun/Contrast-Finder/issues/167)
- [#168 - Upgraded maven-surefire-plugin (2.22.0 instead of 2.21.0)](https://github.com/Asqatasun/Contrast-Finder/issues/168)
- [#169 - Upgraded maven-dependency-plugin (3.1.1 instead of 3.1.0)](https://github.com/Asqatasun/Contrast-Finder/issues/169)
- [#173 - Upgraded maven-compiler-plugin (3.8.0 instead of 3.7.0)](https://github.com/Asqatasun/Contrast-Finder/issues/173)
- [#174 - Upgraded maven-project-info-reports-plugin (3.0.0 instead of 2.9)](https://github.com/Asqatasun/Contrast-Finder/issues/174)
- [#175 - Upgraded jacoco-maven-plugin (0.8.2 instead of 0.8.1)](https://github.com/Asqatasun/Contrast-Finder/issues/175)
- [#170 - Upgraded owasp:dependency-check (3.3.1 instead of 3.1.2)](https://github.com/Asqatasun/Contrast-Finder/issues/170)

### Bug
- [#166 - Used an independent subproject for jdeb (debian packages creation)](https://github.com/Asqatasun/Contrast-Finder/issues/166)

### Improvement
- [#165 - Added some information to the MANIFEST.MF files : commit, buid timestamp](https://github.com/Asqatasun/Contrast-Finder/issues/165)
- [#172 - All maven plugins have their version specified](https://github.com/Asqatasun/Contrast-Finder/issues/172)

### Documentation
- [#179 - Transformed Debian packages documentation into markdown file](https://github.com/Asqatasun/Contrast-Finder/issues/179)
- Updating screenshots

### Task
- [#171 - Webapp: added humans.txt file](https://github.com/Asqatasun/Contrast-Finder/issues/171)


Contrast-Finder 0.9.1, 2018-05-13
---------------------------------

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[![License : AGPL v3](https://img.shields.io/badge/License-AGPL3-blue.svg)](https://github.com/Asqatasun/Contrast-Finder/blob/master/LICENSE)
[![Build Status](https://travis-ci.org/Asqatasun/Contrast-Finder.svg)](https://travis-ci.org/Asqatasun/Contrast-Finder)
[![Release](https://img.shields.io/github/release/asqatasun/Contrast-Finder.svg)](https://github.com/Asqatasun/Contrast-Finder/releases/latest)
[![Dependency Status](https://www.versioneye.com/user/projects/59405a130fb24f004de09e90/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/59405a130fb24f004de09e90)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c3374c9913d24a9c91e91552f1796672)](https://www.codacy.com/app/Asqatasun/Contrast-Finder)
[![Code of Conduct](https://img.shields.io/badge/code%20of-conduct-ff69b4.svg?style=flat-square)](https://github.com/Asqatasun/Contrast-Finder/blob/develop/CODE_OF_CONDUCT.md)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/Asqatasun/Contrast-Finder/blob/develop/CONTRIBUTING.md)
Expand All @@ -20,7 +19,7 @@
## Demo
https://app.contrast-finder.org

[![Try Contrast-Finder](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.5.2_2017-07-27_grey_kraken.io-lossy.png)](https://app.contrast-finder.org/?lang=en "Try Contrast-Finder : find good color for web accessibility")
[![Try Contrast-Finder](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.9.1_2018-09-27_grey_kraken.io-lossy.png)](https://app.contrast-finder.org/?lang=en "Try Contrast-Finder : find good color for web accessibility")


## Why another contrast tool ?
Expand Down
168 changes: 168 additions & 0 deletions dist./debian_package/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>dist</artifactId>
<version>0.9.2</version>
</parent>
<artifactId>contrast-finder-dist_debian-packages</artifactId>
<version>0.9.2</version>
<packaging>jar</packaging>
<name>contrast-finder-dist_debian-packages</name>
<licenses>
<license>
<name>GNU Affero General Public License v3.0</name>
<url>https://www.gnu.org/licenses/agpl-3.0.txt</url>
<distribution>manual</distribution>
</license>
</licenses>
<url>https://contrast-finder.org</url>
<organization>
<name>Asqatasun.org</name>
<url>https://asqatasun.org</url>
</organization>

<properties>
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

<!-- Plugin Versions -->
<jdeb.version>1.6</jdeb.version> <!-- need Maven with Jdk-8 -->
</properties>



<build>
<finalName>contrast-finder-webapp_${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

<!-- jdeb: maven plugin to create Debian packages from Java build
https://github.com/tcurdt/jdeb -->
<plugin>
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
<version>${jdeb.version}</version>
<executions>
<execution>
<id>jdeb_tomcat7</id>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<deb>${project.build.directory}/contrast-finder-webapp_${project.version}_tomcat7.deb</deb>
<verbose>true</verbose>
<controlDir>${project.basedir}/src/deb/tomcat7/control</controlDir>
<dataSet>
<data>
<type>template</type>
<paths>
<path>/etc/contrast-finder</path>
<path>/var/log/contrast-finder</path>
</paths>
</data>
<data>
<conffile>true</conffile>
<type>file</type>
<src>../../webapp/src/main/resources/conf/contrast-finder.conf.dist</src>
<dst>/etc/contrast-finder/contrast-finder.conf.dist</dst>
<mapper>
<type>perm</type>
<user>tomcat7</user>
</mapper>
</data>
<data>
<type>file</type>
<src>../../webapp/src/main/resources/conf/contrast-finder.log</src>
<mapper>
<type>perm</type>
<prefix>/var/log/contrast-finder</prefix>
<user>tomcat7</user>
</mapper>
</data>
<data>
<type>file</type>
<src>../../webapp/target/contrast-finder-webapp_${project.version}.war</src>
<dst>contrast-finder.war</dst>
<mapper>
<type>perm</type>
<prefix>/var/lib/tomcat7/webapps</prefix>
<user>tomcat7</user>
</mapper>
</data>
<data>
<type>file</type>
<src>${project.basedir}/src/deb/tomcat7/copyright</src>
<dst>/usr/share/doc/contrast-finder-webapp/copyright</dst>
</data>
</dataSet>
</configuration>
</execution>
<execution>
<id>jdeb_tomcat8</id>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<deb>${project.build.directory}/contrast-finder-webapp_${project.version}_tomcat8.deb</deb>
<verbose>true</verbose>
<controlDir>${project.basedir}/src/deb/tomcat8/control</controlDir>
<dataSet>
<data>
<type>template</type>
<paths>
<path>/etc/contrast-finder</path>
<path>/var/log/contrast-finder</path>
</paths>
</data>
<data>
<conffile>true</conffile>
<type>file</type>
<src>../../webapp/src/main/resources/conf/contrast-finder.conf.dist</src>
<mapper>
<type>perm</type>
<prefix>/etc/contrast-finder</prefix>
<user>tomcat8</user>
</mapper>
</data>
<data>
<type>file</type>
<src>../../webapp/src/main/resources/conf/contrast-finder.log</src>
<mapper>
<type>perm</type>
<prefix>/var/log/contrast-finder</prefix>
<user>tomcat8</user>
</mapper>
</data>
<data>
<type>file</type>
<src>../../webapp/target/contrast-finder-webapp_${project.version}.war</src>
<dst>contrast-finder.war</dst>
<mapper>
<type>perm</type>
<prefix>/var/lib/tomcat8/webapps</prefix>
<user>tomcat8</user>
</mapper>
</data>
<data>
<type>file</type>
<src>${project.basedir}/src/deb/tomcat8/copyright</src>
<dst>/usr/share/doc/contrast-finder-webapp/copyright</dst>
</data>
</dataSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: [[name]]
Package: [[name]]
Package: Contrast-Finder_webapp-for-tomcat7
Version: [[version]]
Section: web
Priority: optional
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: [[name]]
Package: [[name]]
Package: Contrast-Finder_webapp-for-tomcat8
Version: [[version]]
Section: web
Priority: optional
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
29 changes: 29 additions & 0 deletions dist./pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.asqatasun</groupId>
<artifactId>contrast-finder</artifactId>
<version>0.9.2</version>
</parent>
<artifactId>dist</artifactId>
<version>0.9.2</version>
<packaging>pom</packaging>
<name>contrast-finder-dist</name>
<licenses>
<license>
<name>GNU Affero General Public License v3.0</name>
<url>https://www.gnu.org/licenses/agpl-3.0.txt</url>
<distribution>manual</distribution>
</license>
</licenses>
<url>https://contrast-finder.org</url>
<organization>
<name>Asqatasun.org</name>
<url>https://asqatasun.org</url>
</organization>

<modules>
<module>debian_package</module>
</modules>
</project>
8 changes: 4 additions & 4 deletions docker/RELEASE/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ Supported tags and respective `Dockerfile` links :
* [pre-requisites_Alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_Alpine_tomcat-8.5/Dockerfile)

### Releases
* [latest, v0.9.1, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile)
* [alpine, v0.9.1_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile)
* [v0.9.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.0/docker/RELEASE/Dockerfile), [v0.8.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.6/docker/RELEASE/Dockerfile), [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/docker/RELEASE/Dockerfile), [v0.8.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.0/docker/RELEASE/Dockerfile)
* [latest, v0.9.2, ubuntu-18.04](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/ubuntu-18.04_tomcat-8.5/Dockerfile)
* [alpine, v0.9.2_alpine, alpine_tomcat-8.5](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/alpine_tomcat-8.5/Dockerfile)
* [v0.9.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.1/docker/RELEASE/Dockerfile), [v0.9.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.9.0/docker/RELEASE/Dockerfile), [v0.8.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.6/docker/RELEASE/Dockerfile), [v0.8.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.5/docker/RELEASE/Dockerfile), [v0.8.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.4/docker/RELEASE/Dockerfile), [v0.8.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.3/docker/RELEASE/Dockerfile), [v0.8.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.2/docker/RELEASE/Dockerfile), [v0.8.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.8.1/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)

## How to use this image
Expand All @@ -34,7 +34,7 @@ In your browser, go to `http://localhost:8080/contrast-finder/`
* More information on the website [Contrast-Finder.org](https://contrast-finder.org)
* Demo : https://app.contrast-finder.org

![Screenshot - Contrast-Finder v0.5.2](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.5.2_2017-07-27_grey_kraken.io-lossy.png)
![Screenshot - Contrast-Finder v0.9.1](https://raw.githubusercontent.com/Asqatasun/Contrast-Finder/develop/documentation/en/images/screenshot/screenshot.EN_contrast-finder.v0.9.1_2018-09-27_grey_kraken.io-lossy.png)

## Tips and tricks
### Container available only on 127.0.0.1 (Linux users) ####
Expand Down
10 changes: 5 additions & 5 deletions docker/RELEASE/alpine_tomcat-7/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM asqatasun/contrast-finder:pre-requisites_Alpine_tomcat-7
LABEL org.label-schema.schema-version = "1.0.0-rc.1" \
org.label-schema.name = "Contrast-Finder - WebApp (tomcat7 < jdk7 < alpine 3.7)" \
org.label-schema.version = "0.9.1" \
org.label-schema.version = "0.9.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:alpine" \
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.9.1 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.1/contrast-finder-webapp_0.9.1.tar.gz .
# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.9.2 .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.2/ .
# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.9.2/contrast-finder-webapp_0.9.2.tar.gz .
#
# --- Launch a container
# docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
Expand All @@ -39,7 +39,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
###################################################################

# build variables
ARG CONTRAST_FINDER_RELEASE="0.9.1"
ARG CONTRAST_FINDER_RELEASE="0.9.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-webapp_${CONTRAST_FINDER_RELEASE}.tar.gz"

Expand Down
Loading

0 comments on commit 294ad1d

Please sign in to comment.