Merge branch 'release/1.2.1'

# Conflicts: # README.md # pom.xml
gabrysbiz · Nov 12, 2016 · 5866781 · 5866781
2 parents 20793f1 + a9c91c1
commit 5866781
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # LessCSS Maven Plugin Changelog
 
+## 1.2.1
+Dependencies:
+* Use [LessCSS Compiler 1.2.2](http://lesscss-compiler.projects.gabrys.biz/1.2.2/) (fixed support for `data-uri` function - only for `local` compiler type)
+
+[See documentation](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/)
+
 ## 1.2.0
 Dependencies:
 * Upgrade [Extended LessCSS Compiler](http://lesscss-extended-compiler.projects.gabrys.biz/) from [2.0](http://lesscss-extended-compiler.projects.gabrys.biz/2.0/) to [2.1.0](http://lesscss-extended-compiler.projects.gabrys.biz/2.1.0/) (support for `classpath://` protocol)

diff --git a/README.md b/README.md
@@ -5,30 +5,30 @@
 This plugin compiles [Less](http://lesscss.org/) files to [CSS](http://www.w3.org/Style/CSS/) stylesheets using [extended version](http://lesscss-extended-compiler.projects.gabrys.biz/) of the [LessCSS Compiler](http://lesscss-compiler.projects.gabrys.biz/).
 
 The plugin was developed as an alternative version of the [org.lesscss:lesscss-maven-plugin](https://github.com/marceloverdijk/lesscss-maven-plugin) (by [Marcel Overdijk](https://github.com/marceloverdijk)) which is compatible with [Less 1.7.5](https://github.com/less/less.js/releases/tag/v1.7.5). It resolves all problems with [imports options](http://lesscss.org/features/#import-options) and adds extra features:
-* two [compiler types](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/compilers-comparison.html) for lower disk usage
-* [inserts sources paths](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/compile-mojo.html#addCommentsWithPaths) to [CSS](http://www.w3.org/Style/CSS/) stylesheets (assists work on large files)
+* two [compiler types](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/compilers-comparison.html) for lower disk usage
+* [inserts sources paths](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/compile-mojo.html#addCommentsWithPaths) to [CSS](http://www.w3.org/Style/CSS/) stylesheets (assists work on large files)
 
-Read a [migration](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/migration.html) page for information how to switch from the [org.lesscss:lesscss-maven-plugin](https://github.com/marceloverdijk/lesscss-maven-plugin) to this plugin.
+Read a [migration](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/migration.html) page for information how to switch from the [org.lesscss:lesscss-maven-plugin](https://github.com/marceloverdijk/lesscss-maven-plugin) to this plugin.
 
 # Goals Overview
-* [lesscss:compile](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/compile-mojo.html) - compiles [Less](http://lesscss.org/) files to [CSS](http://www.w3.org/Style/CSS/) stylesheets
+* [lesscss:compile](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/compile-mojo.html) - compiles [Less](http://lesscss.org/) files to [CSS](http://www.w3.org/Style/CSS/) stylesheets
 
 # Requirements
 The plugin to run requires:
 * Java 5.0 or higher
 * Maven 2.0.11 or higher
 
 # Usage
-General instructions on how to use the LessCSS Maven Plugin can be found on the [usage](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/usage.html) page. Some more specific use cases are described in the examples given below. Last but not least, users occasionally contribute additional examples, tips or errata to the plugin's [wiki](https://github.com/gabrysbiz/lesscss-maven-plugin/wiki) page.
+General instructions on how to use the LessCSS Maven Plugin can be found on the [usage](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/usage.html) page. Some more specific use cases are described in the examples given below. Last but not least, users occasionally contribute additional examples, tips or errata to the plugin's [wiki](https://github.com/gabrysbiz/lesscss-maven-plugin/wiki) page.
 
-In case you still have questions regarding the plugin's usage, please have a look at the [FAQ](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/faq.html).
+In case you still have questions regarding the plugin's usage, please have a look at the [FAQ](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/faq.html).
 
-If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in the [issue tracker](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/issue-tracking.html). When creating a new issue, please provide a comprehensive description of your concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason, entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated. Of course, patches are welcome, too. Contributors can check out the project from the [source repository](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/source-repository.html) and will find supplementary information in the [guide to helping with Maven](http://maven.apache.org/guides/development/guide-helping.html).
+If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in the [issue tracker](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/issue-tracking.html). When creating a new issue, please provide a comprehensive description of your concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason, entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated. Of course, patches are welcome, too. Contributors can check out the project from the [source repository](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/source-repository.html) and will find supplementary information in the [guide to helping with Maven](http://maven.apache.org/guides/development/guide-helping.html).
 
 # Examples
 To provide you with better understanding of some usages of the LessCSS Maven Plugin, you can take a look into the following examples:
-* [Using include/exclude patterns](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/examples/patterns.html)
-* [Multiple source/output directories](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/examples/multiple-directories.html)
-* [Sources located only on local hard drive](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/examples/local-sources.html)
+* [Using include/exclude patterns](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/examples/patterns.html)
+* [Multiple source/output directories](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/examples/multiple-directories.html)
+* [Sources located only on local hard drive](http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/examples/local-sources.html)
 
 You can also fetch example projects from [GitHub](https://github.com/gabrysbiz/lesscss-maven-plugin-examples).
diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,11 @@
 
     <groupId>biz.gabrys.maven.plugins</groupId>
     <artifactId>lesscss-maven-plugin</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <packaging>maven-plugin</packaging>
     <name>LessCSS Maven Plugin</name>
     <description>Compiles Less sources to CSS files using extended version of the LessCSS Compiler.</description>
-    <url>http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/</url>
+    <url>http://lesscss-maven-plugin.projects.gabrys.biz/1.2.1/</url>
 
     <inceptionYear>2015</inceptionYear>
     <organization>
@@ -103,6 +103,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>biz.gabrys.lesscss</groupId>
+            <artifactId>compiler</artifactId>
+            <version>1.2.2</version>
+        </dependency>
         <dependency>
             <groupId>biz.gabrys.lesscss</groupId>
             <artifactId>extended-compiler</artifactId>

diff --git a/src/main/java/biz/gabrys/maven/plugins/lesscss/CompileMojo.java b/src/main/java/biz/gabrys/maven/plugins/lesscss/CompileMojo.java
@@ -22,7 +22,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -265,7 +264,7 @@ private void logParameters() {
         final ParametersLogBuilder logger = new ParametersLogBuilder(getLog());
         logger.append("skip", skip);
         logger.append("verbose", verbose, new SimpleSanitizer(verbose, Boolean.TRUE));
-        logger.append("force", force, new SimpleSanitizer(!watch || watch && !force, Boolean.FALSE));
+        logger.append("force", force, new SimpleSanitizer(!watch || !force, Boolean.FALSE));
         logger.append("alwaysOverwrite", alwaysOverwrite, new SimpleSanitizer(!(!watch && force && !alwaysOverwrite), Boolean.TRUE));
         logger.append("sourceDirectory", sourceDirectory);
         logger.append("outputDirectory", outputDirectory);
@@ -348,7 +347,7 @@ private void calculateParameters() {
         }
     }
 
-    public void execute() throws MojoExecutionException, MojoFailureException {
+    public void execute() throws MojoFailureException {
         logParameters();
         if (skip) {
             getLog().info("Skips job execution");
@@ -367,7 +366,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         }
     }
 
-    private void addDependenciesToClasspath() throws MojoExecutionException {
+    private void addDependenciesToClasspath() {
         if (verbose) {
             getLog().info("Adding project dependencies to classpath...");
         }

diff --git a/xdocs/changelog.xml b/xdocs/changelog.xml
@@ -7,6 +7,15 @@
     </properties>
 
     <body>
+        <section id="release-1.2.1" name="Release 1.2.1">
+            <p>Dependencies:</p>
+            <ul>
+                <li>
+                    Use <a href="http://lesscss-compiler.projects.gabrys.biz/1.2.2/">LessCSS Compiler 1.2.2</a>
+                    (fixed support for <code>data-uri</code> function - only for <code>local</code> compiler type)
+                </li>
+            </ul>
+        </section>
         <section id="release-1.2.0" name="Release 1.2.0">
             <p>Dependencies:</p>
             <ul>
@@ -17,6 +26,7 @@
                     (support for <code>classpath://</code> protocol)
                 </li>
             </ul>
+            <p><a href="http://lesscss-maven-plugin.projects.gabrys.biz/1.2.0/">See documentation</a></p>
         </section>
         <section id="release-1.1" name="Release 1.1">
             <p>Dependencies:</p>
@@ -27,7 +37,7 @@
                     to <a href="http://lesscss-extended-compiler.projects.gabrys.biz/2.0/">2.0</a>
                 </li>
             </ul>
-            <p><a href="http://lesscss-maven-plugin.projects.gabrys.biz/2.0/">See documentation</a></p>
+            <p><a href="http://lesscss-maven-plugin.projects.gabrys.biz/1.1/">See documentation</a></p>
         </section>
         <section id="release-1.0" name="Release 1.0">
             <p>Initial release.</p>