Merge 6.1.beta2 into stable

Conflicts: CHANGELOG.md INSTALL.md documentation/FreeBSD-FreeNAS-Install.md documentation/INSTALL.md libresonic-assembly/pom.xml libresonic-booter/pom.xml libresonic-installer-debian/pom.xml libresonic-installer-mac/pom.xml libresonic-installer-rpm/pom.xml libresonic-installer-windows/pom.xml libresonic-main/pom.xml libresonic-rest-api/pom.xml libresonic-sonos-api/pom.xml pom.xml
8 years ago · 5c5bce6f8d
parent 6ec5b4ef25 fa00684a27
commit 5c5bce6f8d
15 changed files with 18 additions and 16 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,7 +3,7 @@
 # Libresonic/libresonic
 # -->

-v6.1.rc1
+v6.1.beta2
 --------

  * Metaproject: Jenkins builds!
--- a/INSTALL.md
+++ b/INSTALL.md
@ -23,7 +23,7 @@ Daily WAR files are built by Jenkins and available [here](https://jenkins.zifnab

 1.  Download the latest war file:

-		wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.rc1/libresonic-main-6.1.rc1.war -O /var/lib/tomcat8/webapps/libresonic.war
+		wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.beta2/libresonic-main-6.1.beta2.war -O /var/lib/tomcat8/webapps/libresonic.war

 	Note that this command copies the war file directly to the Tomcat webapps directory, and renames it to `libresonic.war`.

--- a/documentation/FreeBSD-FreeNAS-Install.md
+++ b/documentation/FreeBSD-FreeNAS-Install.md
@ -66,15 +66,15 @@ Open a web browser and enter your servers IP address in the url bar followed by

 You should be greeted by the Apache Tomcat page.  Click on the Manager App button on the right of the page and enter the username and password used in step 3.  Default was username: admin and password: admin

-Scroll down to Deploy and the subheading "WAR file to deploy" hit choose file and select the libresonic.war downloaded in the preamble.  After selecting press the deploy button.  Scroll up and press start.  When the page refreshes a message "OK - Started application at context path /libresonic-v6.1.rc1" should be visible.
+Scroll down to Deploy and the subheading "WAR file to deploy" hit choose file and select the libresonic.war downloaded in the preamble.  After selecting press the deploy button.  Scroll up and press start.  When the page refreshes a message "OK - Started application at context path /libresonic-v6.1" should be visible.

 ### 6. Navigate to Libresonic

 In a browser.  Take your server IP address and port and append the the context path from above

-ie if the War deployed was called libresonic-v6.1.rc1.war navigate to:
+ie if the War deployed was called libresonic-v6.1.war navigate to:

-    10.0.0.10:8080/libresonic-v6.1.rc1/
+    10.0.0.10:8080/libresonic-v6.1/

 ### 7. Log into Libresonic

--- a/documentation/INSTALL.md
+++ b/documentation/INSTALL.md
@ -23,7 +23,7 @@ Daily WAR files are built by Jenkins and available [here](https://jenkins.zifnab

 1.  Download the latest war file:

-		wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.rc1/libresonic-main-6.1.rc1.war -O /var/lib/tomcat8/webapps/libresonic.war
+		wget https://jenkins.zifnab.net/job/libresonic/lastSuccessfulBuild/artifact/.repository/org/libresonic/player/libresonic-main/6.1.beta2/libresonic-main-6.1.beta2.war -O /var/lib/tomcat8/webapps/libresonic.war

 	Note that this command copies the war file directly to the Tomcat webapps directory, and renames it to `libresonic.war`.

--- a/libresonic-assembly/pom.xml
+++ b/libresonic-assembly/pom.xml
@ -9,7 +9,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <dependencies>
--- a/libresonic-booter/pom.xml
+++ b/libresonic-booter/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <dependencies>
--- a/libresonic-installer-debian/pom.xml
+++ b/libresonic-installer-debian/pom.xml
@ -9,7 +9,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <profiles>
--- a/libresonic-installer-mac/pom.xml
+++ b/libresonic-installer-mac/pom.xml
@ -9,7 +9,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <dependencies>
--- a/libresonic-installer-rpm/pom.xml
+++ b/libresonic-installer-rpm/pom.xml
@ -9,7 +9,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <profiles>
--- a/libresonic-installer-windows/pom.xml
+++ b/libresonic-installer-windows/pom.xml
@ -9,7 +9,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <properties>
--- a/libresonic-main/pom.xml
+++ b/libresonic-main/pom.xml
@ -9,7 +9,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <dependencies>
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
@ -819,6 +819,8 @@ helppopup.playername.text = <p>Allows you to specify an easy-to-remember name fo
 helppopup.autocontrol.title = Control player automatically
 helppopup.autocontrol.text = <p>With this option selected, {0} will automatically start the player when you click "Play" \
                             in the playlist. Otherwise, you must start and connect the player yourself.</p>
+helppopup.m3ubom.title = Apply BOM in M3U file
+helppopup.m3ubom.text = <p>Apply a BOM mark in generated M3U playlists for Unicode compatibility.</p>
 helppopup.dynamicip.title = Dynamic IP address
 helppopup.dynamicip.text = <p>Turn off this option if the player uses a static IP address.</p>
 helppopup.smtpServer.title = SMTP Server
--- a/libresonic-rest-api/pom.xml
+++ b/libresonic-rest-api/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <build>
--- a/libresonic-sonos-api/pom.xml
+++ b/libresonic-sonos-api/pom.xml
@ -8,7 +8,7 @@
    <parent>
        <groupId>org.libresonic.player</groupId>
        <artifactId>libresonic</artifactId>
-        <version>6.1.rc1</version>
+        <version>6.1</version>
    </parent>

    <build>
--- a/pom.xml
+++ b/pom.xml
@ -4,7 +4,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.libresonic.player</groupId>
    <artifactId>libresonic</artifactId>
-    <version>6.1.rc1</version>
+    <version>6.1</version>
    <name>Libresonic</name>
    <packaging>pom</packaging>
    <organization>