Merge remote-tracking branch 'origin/release/1.9.x'

.gitignore

@@ -1,8 +1,11 @@
-target
+.settings/
+target/
+
+*.iml
+*.releaseBackup
 .classpath
-.settings
-.project
+.DS_Store
 .idea
-*.iml
+.project
 .sass-cache
-
+release.properties

.travis.yml

@@ -1,5 +1,8 @@
 language: java
+sudo: false # faster builds
+jdk:
+  - openjdk9
+  - openjdk10
+  - openjdk11
 script:  mvn clean test
 env: MAVEN_OPTS=" -Xmx2048m -Xms768m -XX:MaxPermSize=512m"
-
-

README.md

@@ -1,7 +1,10 @@
 # <img src="http://code.google.com/p/wro4j/logo"> Web Resource Optimizer for Java
 [![Join the chat at https://gitter.im/wro4j/wro4j](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/wro4j/wro4j?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://api.travis-ci.org/wro4j/wro4j.svg)](http://travis-ci.org/wro4j/wro4j)
+[![Coverage Status](https://codecov.io/github/wro4j/wro4j/coverage.png?branch=master)](https://codecov.io/github/wro4j/wro4j?branch=master)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ro.isdc.wro4j/wro4j-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ro.isdc.wro4j/wro4j-core)
+[![Stories in Ready](https://badge.waffle.io/wro4j/wro4j.png?label=ready&title=Ready)](http://waffle.io/wro4j/wro4j)
+
 
 
 wro4j is a free and Open Source Java project which will help you to [easily improve](http://wro4j.github.com/wro4j) your web application page loading time. It can help you to keep your static resources (js & css) [well organized](http://wro4j.readthedocs.org/en/stable/WroFileFormat), merge & minify them at [run-time](http://wro4j.readthedocs.org/en/stable/Installation) (using a simple filter) or [build-time](http://wro4j.readthedocs.org/en/stable/MavenPlugin) (using maven plugin) and has a [dozen of features](http://wro4j.readthedocs.org/en/stable/Features) you may find useful when dealing with web resources.

docs/ConfigurableWroManagerFactory.md

@@ -1,12 +1,13 @@
-#summary This page describes how to use *ConfigurableWroManagerFactory* and why it is useful.
-#labels Phase-Implementation
-
+---
+summary: This page describes how to use ConfigurableWroManagerFactory and why it is useful.
+labels: Phase-Implementation
+---
 
 # Introduction
 _ConfigurableWroManagerFactory_ is very useful when you want easily add or remove resource pre/post processors. 
 
 _Related pages_ 
-[AvailableProcessors](AvailableProcessors) - a list of processors provided by wro4j and their alias.
+[AvailableProcessors](AvailableProcessors.md) - a list of processors provided by wro4j and their alias.
 
 ## Configuring with wro4j-1.4.0 
 Starting with version 1.4.0, the configuration become even more easier. 
@@ -164,7 +165,8 @@ And finally, update the filter configuration in web.xml:
 ```
 
 ### Available Locators
-| *Name* | *Class* | 
+| Name | Class | 
+|--------|---------|
 | servletContext | ServletContextUriLocator |
 | classpath | ClasspathUriLocator |
 | url | UrlUriLocator |
@@ -179,7 +181,8 @@ The ExtensionsConfigurableWroManagerFactory is an extension of ConfigurableWroMa
 * googleClosureAdvanced - GoogleClosureCompressorProcessor(CompilationLevel.ADVANCED_OPTIMIZATIONS)
 
 In order to use it, all you have to do is:
-# add wro4j-extensions to classpath, manually or by adding wro4j-extensions dependency to pom.xml:
+
+add wro4j-extensions to classpath, manually or by adding wro4j-extensions dependency to pom.xml:
 ```xml
 <dependency>
     <groupId>ro.isdc.wro4j</groupId>
@@ -188,6 +191,7 @@ In order to use it, all you have to do is:
 </dependency>
 ```
 where *wro4j.version* - is the latest version of wro4j.
+
 configure the filter this way:
 
 ```xml
@@ -211,4 +215,4 @@ configure the filter this way:
       <param-value>cssVariables,googleClosureSimple,yuiCssMin</param-value>
     </init-param>
   </filter>
-```
+```

docs/ConfigurationOptions.md

@@ -2,7 +2,7 @@
 title: Configurations Options
 tags: [getting-started]
 keywords: start, introduction, begin, install, build, hello world,
-last_updated: August 12, 2015
+last_updated: November 8, 2016
 summary: ""
 ---
 
@@ -53,6 +53,6 @@ The following parameters are available:
 ### What are the differences between DEVELOPMENT & DEPLOYMENT? 
   There are a couple of differences between those two modes:
 
-	* In DEVELOPMENT - you can add "?minimize=false" in request url in 
-	  order to turn off minimization on static resources, while in DEPLOYMENT you can't. 
-	* In DEVELOPMENT mode any runtime exception is logged and thrown further, while in DEPLOYMENT it is logged and the response is redirected to 404. 
+  * In DEVELOPMENT - you can add `?minimize=false` in request url in order to turn off minimization on static resources, while in DEPLOYMENT you can't. 
+  * In DEVELOPMENT mode any runtime exception is logged and thrown further, while in DEPLOYMENT it is logged and the response is redirected to 404. 
+  * In DEVELOPMENT mode you can reset the in-memory cache. See the [FAQ](FAQ.md#how-to-update-the-cache-at-runtime) for details.

docs/FAQ.md

@@ -43,6 +43,9 @@ Also, the project is split into several modules: core, extensions, maven-plugin
 ## How can I change the Configuration Mode in the runtime
 > Since 1.2.0 version, you can use JMX to change several properties, including configuration mode. Read more: [RuntimeConfigurationsUsingJMX] 
 
+## What are available configuration options
+> See the respective chapter in the [documentation](ConfigurationOptions.md).
+
 ## How to add easily custom resource processors
 > The ConfigurableWroManagerFactory can help you. Read more [here](ConfigurableWroManagerFactory)
 
@@ -82,8 +85,8 @@ Also, the project is split into several modules: core, extensions, maven-plugin
       ro.isdc.wro.http.WroFilter
     </filter-class>
     <init-param>
-      <param-name>configuration</param-name>
-      <param-value>DEPLOYMENT</param-value>
+      <param-name>debug</param-name>
+      <param-value>false</param-value>
     </init-param>
     <init-param>
       <param-name>jmxEnabled</param-name>
@@ -140,4 +143,4 @@ log4j.logger.ro.isdc=DEBUG
 > --* ```ro.isdc.wro.model.resource.processor.decorator.ExceptionHandlingProcessorDecorator``` class if you are interested in exceptions reported by processors only. This is a more selective approach. Example:
 ```
 log4j.logger.ro.isdc.wro.model.resource.processor.decorator.ExceptionHandlingProcessorDecorator=DEBUG
-```
+```