Merge remote-tracking branch 'pull/85' into develop

.gitignore

@@ -1 +1,7 @@
 target/
+
+# eclipse configs
+.project
+.settings
+.classpath
+

libresonic-main/pom.xml

@@ -385,6 +385,7 @@
         <plugins>
 
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>

pom.xml

@@ -22,13 +22,8 @@
     <repositories>
         <repository>
             <id>local1</id>
-            <name>Local Repository 1</name>
+            <name>Local Repository</name>
-            <url>file:repo</url>
+            <url>file://${project.basedir}/../repo</url>
-        </repository>
-        <repository>
-            <id>local2</id>
-            <name>Local Repository 2</name>
-            <url>file:../repo</url>
         </repository>
         <repository>
             <id>java_net</id>
@@ -45,13 +40,8 @@
     <pluginRepositories>
         <pluginRepository>
             <id>local1</id>
-            <name>Local Repository 1</name>
+            <name>Local Repository</name>
-            <url>file:repo</url>
+            <url>file://${project.basedir}/../repo</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>local2</id>
-            <name>Local Repository 2</name>
-            <url>file:../repo</url>
         </pluginRepository>
     </pluginRepositories>
 
@@ -107,27 +97,27 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>3.5.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2.1</version>
+                    <version>2.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.6</version>
+                    <version>1.8</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.0</version>
+                    <version>1.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.cxf</groupId>
@@ -148,11 +138,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.6</source>
+                    <source>1.8</source>
-                    <target>1.6</target>
+                    <target>1.8</target>
                     <encoding>ISO-8859-1</encoding>
                     <verbose>false</verbose>
-                    <compilerVersion>1.6</compilerVersion>
+                    <compilerVersion>1.8</compilerVersion>
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>