diff --git a/.gitignore b/.gitignore index 2f7896d1..2866ee5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ target/ + +# eclipse configs +.project +.settings +.classpath + diff --git a/libresonic-main/pom.xml b/libresonic-main/pom.xml index 22bbaa82..4b758233 100644 --- a/libresonic-main/pom.xml +++ b/libresonic-main/pom.xml @@ -385,6 +385,7 @@ + org.apache.maven.plugins maven-antrun-plugin diff --git a/pom.xml b/pom.xml index 89d1557e..3ecb5b92 100644 --- a/pom.xml +++ b/pom.xml @@ -22,13 +22,8 @@ local1 - Local Repository 1 - file:repo - - - local2 - Local Repository 2 - file:../repo + Local Repository + file://${project.basedir}/../repo java_net @@ -45,13 +40,8 @@ local1 - Local Repository 1 - file:repo - - - local2 - Local Repository 2 - file:../repo + Local Repository + file://${project.basedir}/../repo @@ -107,27 +97,27 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.5.1 org.apache.maven.plugins maven-assembly-plugin - 2.2.1 + 2.6 org.apache.maven.plugins maven-antrun-plugin - 1.6 + 1.8 org.apache.maven.plugins maven-dependency-plugin - 2.2 + 2.10 org.codehaus.mojo buildnumber-maven-plugin - 1.0 + 1.4 org.apache.cxf @@ -148,11 +138,11 @@ org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 ISO-8859-1 false - 1.6 + 1.8 true