MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eugene E. Kashpureff Jr
2016-05-18 00:20:49 +00:00
parent d1c8acdbfe e094ec5e1c
commit 8a89402106
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+6
View File
@@ -1 +1,7 @@
target/
# eclipse configs
.project
.settings
.classpath
libresonic-main/pom.xml
+1
View File
@@ -385,6 +385,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
pom.xml
+12 -22
View File
@@ -22,13 +22,8 @@
<repositories>
<repository>
<id>local1</id>
<name>Local Repository 1</name>
<url>file:repo</url>
</repository>
<repository>
<id>local2</id>
<name>Local Repository 2</name>
<url>file:../repo</url>
<name>Local Repository</name>
<url>file://${project.basedir}/../repo</url>
</repository>
<repository>
<id>java_net</id>
@@ -45,13 +40,8 @@
<pluginRepositories>
<pluginRepository>
<id>local1</id>
<name>Local Repository 1</name>
<url>file:repo</url>
</pluginRepository>
<pluginRepository>
<id>local2</id>
<name>Local Repository 2</name>
<url>file:../repo</url>
<name>Local Repository</name>
<url>file://${project.basedir}/../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>
<target>1.6</target>
<source>1.8</source>
<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>