#3 #5 #7 #8 Upgrade dependencies, cleanup JavaScript files, update changelog

- upgrade Maven dependencies and libraries
- use JDK6
- move JavaScript files to src/main/javascript
- clean JavaScript code and remove unsupported parameters

Author: agabrys

CHANGELOG.md

@@ -1,5 +1,12 @@
 # LessCSS Compiler Changelog
 
+## 2.0.0
+Features:
+* Added support for `HTTP`, `HTTPS`, `FTP` and `classpath` protocols
+* Added support for Source maps
+
+[See documentation](http://lesscss-compiler.projects.gabrys.biz/2.0.0/)
+
 ## 1.2.2
 Bugs:
 * Fixed support for `data-uri` function

README.md

@@ -1,25 +1,22 @@
 # About
 [![License BSD 3-Clause](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](http://lesscss-compiler.projects.gabrys.biz/license.txt)
-[![Build Status](https://travis-ci.org/gabrysbiz/lesscss-compiler.svg?branch=develop)](https://travis-ci.org/gabrysbiz/lesscss-compiler)
+[![Build Status](https://travis-ci.org/gabrysbiz/lesscss-compiler.svg?branch=feature%2F2.0)](https://travis-ci.org/gabrysbiz/lesscss-compiler)
 
-The LessCSS Compiler is a Java library which compiles [Less](http://lesscss.org/) source files to the [CSS](http://www.w3.org/Style/CSS/) code.
+The LessCSS Compiler is a Java library which compiles [Less](http://lesscss.org/) source files to [CSS](http://www.w3.org/Style/CSS/) code.
 
 From [Less](http://lesscss.org/) website:
 > Less is a CSS pre-processor, meaning that it extends the CSS language, adding features that allow variables,
 > mixins, functions and many other techniques that allow you to make CSS that is more maintainable, themable
 > and extendable.
 
 # Compatibility
-The compiler is compatible with version	[1.7.5](https://github.com/less/less.js/releases/tag/v1.7.5).
+The compiler is compatible with version [1.7.5](https://github.com/less/less.js/releases/tag/v1.7.5).
 The library is based on the official [Less](http://lesscss.org/) JavaScript compiler adapted to the
 [Rhino](https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Rhino) engine.
 
-Restrictions:
-* cannot fetch sources from Internet, e.g. `@import (less) "http://example.org/style.less"`
-
 # Requirements
 The compiler to run requires:
-* Java 5.0 or higher
+* Java 6.0 or higher
 * Third-Party Dependencies ([see list](http://lesscss-compiler.projects.gabrys.biz/LATEST/dependencies.html))
 
 # Download
@@ -33,14 +30,5 @@ library by [Marcel Overdijk](https://github.com/marceloverdijk).
 # Usage
 How to compile a source file:
 ```
-// create compiler & source file
-LessCompiler compiler = new LessCompilerImpl();
-File source = new File("/less/file.less");
-
-// compile file with default options
-String cssCode = compiler.compile(source); 
-
-// set custom option: minify CSS code
-CompilerOptions options = new CompilerOptionsBuilder().setMinified(true).create();
-String cssMinifiedCode = compiler.compile(source, options);
+// TODO
 ```

pom.xml

@@ -5,9 +5,9 @@
 
     <groupId>biz.gabrys.lesscss</groupId>
     <artifactId>compiler</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <name>LessCSS Compiler</name>
-    <description>A Java library which compiles Less source files to the CSS code.</description>
+    <description>A Java library which compiles Less source files to CSS code.</description>
     <url>http://lesscss-compiler.projects.gabrys.biz/LATEST/</url>
 
     <inceptionYear>2015</inceptionYear>
@@ -76,8 +76,7 @@
         <dependency>
             <groupId>org.mozilla</groupId>
             <artifactId>rhino</artifactId>
-            <!-- latest compatible with JDK 1.5 -->
-            <version>1.7R5</version>
+            <version>1.7.7.1</version>
         </dependency>
 
         <dependency>
@@ -86,15 +85,30 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <!-- latest compatible with JDK 1.6 -->
+            <version>1.7.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>2.7.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>src/main/javascript</directory>
+            </resource>
+        </resources>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -107,7 +121,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.6.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -139,11 +153,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.0.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.5.1</version>
+                    <version>3.6</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>
@@ -173,7 +187,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.7.7.201606060606</version>
+                    <version>0.7.8</version>
                     <configuration>
                         <rules>
                             <rule>
@@ -191,8 +205,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
                 </configuration>

src/main/java/biz/gabrys/lesscss/compiler/LessCompilerImpl.java

@@ -96,6 +96,7 @@ public LessCompilerImpl() {
      * @throws SyntaxException if a syntax error occurred during source file compilation.
      * @since 1.0
      */
+    @Override
     public String compile(final File source) throws CompilerException {
         return compile(source, new CompilerOptions());
     }
@@ -107,6 +108,7 @@ public String compile(final File source) throws CompilerException {
      * @throws SyntaxException if a syntax error occurred during source file compilation.
      * @since 1.0
      */
+    @Override
     public String compile(final File input, final CompilerOptions options) throws CompilerException {
         synchronized (mutex) {
             if (compiler == null) {
@@ -149,8 +151,8 @@ private void initialize() throws InitializationException {
             console = new ByteArrayOutputStream();
             global.setOut(new PrintStream(console, false, CHARSET));
 
-            final URL lessFile = LessCompilerImpl.class.getResource("/less/less-rhino-1.7.5.js");
-            final URL lesscFile = LessCompilerImpl.class.getResource("/less/lessc-rhino-1.7.5.js");
+            final URL lessFile = LessCompilerImpl.class.getResource("/biz/gabrys/lesscss/compiler2/less-rhino-1.7.5.js");
+            final URL lesscFile = LessCompilerImpl.class.getResource("/biz/gabrys/lesscss/compiler2/lessc-rhino-1.7.5.js");
 
             final Collection<InputStream> streams = new ArrayList<InputStream>();
             streams.add(lessFile.openConnection().getInputStream());