From a35010b4a5ff73e3dead4e5a8e925063b94a6caa Mon Sep 17 00:00:00 2001 From: Patrik Johansson Date: Thu, 28 Jan 2016 15:00:57 +0100 Subject: [PATCH] Updated to beta3 for release --- pom.xml | 2 +- subsonic-assembly/pom.xml | 2 +- subsonic-backend/pom.xml | 2 +- .../subsonic/backend/controller/MultiController.java | 2 +- subsonic-booter/pom.xml | 2 +- subsonic-installer-debian/pom.xml | 2 +- subsonic-installer-mac/pom.xml | 2 +- subsonic-installer-rpm/pom.xml | 2 +- subsonic-installer-windows/pom.xml | 2 +- subsonic-main/TODO.TXT | 10 +++++----- subsonic-main/pom.xml | 2 +- .../subsonic/i18n/ResourceBundle_ja_JP.properties | 2 +- subsonic-rest-api/pom.xml | 2 +- subsonic-site/pom.xml | 2 +- subsonic-site/src/main/webapp/download.jsp | 2 +- subsonic-sonos-api/pom.xml | 2 +- subsonic-web/version.html | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 3f6393a..153d2f6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 Subsonic pom diff --git a/subsonic-assembly/pom.xml b/subsonic-assembly/pom.xml index 504ac08..71cdd76 100644 --- a/subsonic-assembly/pom.xml +++ b/subsonic-assembly/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-backend/pom.xml b/subsonic-backend/pom.xml index 452f892..8cbb1c6 100644 --- a/subsonic-backend/pom.xml +++ b/subsonic-backend/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java b/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java index 696ce86..6e0889f 100644 --- a/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java +++ b/subsonic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java @@ -67,7 +67,7 @@ public class MultiController extends MultiActionController { private static final Logger LOG = Logger.getLogger(MultiController.class); private static final String SUBSONIC_VERSION = "5.3"; - private static final String SUBSONIC_BETA_VERSION = "1.0.beta2"; + private static final String SUBSONIC_BETA_VERSION = "1.0.beta3"; private static final Date LICENSE_DATE_THRESHOLD; diff --git a/subsonic-booter/pom.xml b/subsonic-booter/pom.xml index 77d3b51..6a5649c 100644 --- a/subsonic-booter/pom.xml +++ b/subsonic-booter/pom.xml @@ -9,7 +9,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-installer-debian/pom.xml b/subsonic-installer-debian/pom.xml index a24d602..432f9a8 100644 --- a/subsonic-installer-debian/pom.xml +++ b/subsonic-installer-debian/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-installer-mac/pom.xml b/subsonic-installer-mac/pom.xml index bb1a9dd..4871c93 100644 --- a/subsonic-installer-mac/pom.xml +++ b/subsonic-installer-mac/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-installer-rpm/pom.xml b/subsonic-installer-rpm/pom.xml index b9175d1..3724f0a 100644 --- a/subsonic-installer-rpm/pom.xml +++ b/subsonic-installer-rpm/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-installer-windows/pom.xml b/subsonic-installer-windows/pom.xml index db46e9e..0300928 100644 --- a/subsonic-installer-windows/pom.xml +++ b/subsonic-installer-windows/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-main/TODO.TXT b/subsonic-main/TODO.TXT index 68be808..01058b5 100644 --- a/subsonic-main/TODO.TXT +++ b/subsonic-main/TODO.TXT @@ -919,7 +919,7 @@ Check that correct local version is displayed. Upload files to SourceForge (in separate shell, REMEMBER TO CHANGE VERSION BELOW). On Mac OS: - scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta2/ + scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta3/ scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* root@subsonic.org:/usr/local/jakarta/tomcat/download/ On Windows @@ -927,7 +927,7 @@ On Windows svn info svn update mvn clean install -Pfull - scp subsonic-installer-windows/target/subsonic*-setup.exe sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta2/ + scp subsonic-installer-windows/target/subsonic*-setup.exe sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta3/ scp subsonic-installer-windows/target/subsonic*-setup.exe root@subsonic.org:/usr/local/jakarta/tomcat/download/ On demo.subsonic.org (Ubuntu) @@ -938,7 +938,7 @@ On demo.subsonic.org (Ubuntu) mvn clean -Pfull,debian svn st mvn install -Pfull,debian - scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta2/ + scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta3/ scp subsonic-installer-debian/target/subsonic*.deb root@subsonic.org:/usr/local/jakarta/tomcat/download/ On subsonic.org (Fedora) @@ -949,7 +949,7 @@ On subsonic.org (Fedora) mvn clean -Pfull,rpm svn st mvn install -Pfull,rpm - scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta2/ + scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.0.beta3/ # scp subsonic-installer-rpm/target/subsonic*.rpm root@subsonic.org:/usr/local/jakarta/tomcat/download/ cp subsonic-installer-rpm/target/subsonic*.rpm /var/lib/tomcat/download/ @@ -959,7 +959,7 @@ Modify FRS properties Upload site (OLD): rsync -avP -e ssh --exclude ".*" subsonic-web/ sindre_mehus,subsonic@web.sourceforge.net:htdocs/ -svn copy svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/trunk svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/tags/release-1.0.beta2 -m "Tagging 1.0.beta2" +svn copy svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/trunk svn+ssh://sindre_mehus@svn.code.sf.net/p/subsonic/code/tags/release-1.0.beta3 -m "Tagging 1.0.beta3" Post message on forum. Checking for license abuse: diff --git a/subsonic-main/pom.xml b/subsonic-main/pom.xml index 366c6a3..fbb86e6 100644 --- a/subsonic-main/pom.xml +++ b/subsonic-main/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties index a2ce2cb..7985ff3 100644 --- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties +++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties @@ -2,7 +2,7 @@ # Japanese localization. # Author: Takahiro Suzuki (takahiro.suzuki.ja GMAIL) # Author: Kenji Maekawa (chameleon@vega.ocn.ne.jp) -# Author: ChameleonCyber\u0081iFor Version1.0.beta2\u0081@2015/08/23) +# Author: ChameleonCyber\u0081iFor Version1.0.beta3\u0081@2015/08/23) common.home = \u30DB\u30FC\u30E0 common.back = \u623B\u308B diff --git a/subsonic-rest-api/pom.xml b/subsonic-rest-api/pom.xml index d727372..751f1b2 100644 --- a/subsonic-rest-api/pom.xml +++ b/subsonic-rest-api/pom.xml @@ -9,7 +9,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-site/pom.xml b/subsonic-site/pom.xml index 2f1000c..a2240ff 100644 --- a/subsonic-site/pom.xml +++ b/subsonic-site/pom.xml @@ -10,7 +10,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-site/src/main/webapp/download.jsp b/subsonic-site/src/main/webapp/download.jsp index 8845276..b9e65bc 100644 --- a/subsonic-site/src/main/webapp/download.jsp +++ b/subsonic-site/src/main/webapp/download.jsp @@ -23,7 +23,7 @@ <%@ include file="head.jsp" %> <%-- Uncomment if beta is available.--%> - + diff --git a/subsonic-sonos-api/pom.xml b/subsonic-sonos-api/pom.xml index 59a017e..82851cb 100644 --- a/subsonic-sonos-api/pom.xml +++ b/subsonic-sonos-api/pom.xml @@ -8,7 +8,7 @@ net.sourceforge.subsonic subsonic - 1.0.beta2 + 1.0.beta3 diff --git a/subsonic-web/version.html b/subsonic-web/version.html index 636e568..c2fa150 100644 --- a/subsonic-web/version.html +++ b/subsonic-web/version.html @@ -5,7 +5,7 @@

SUBSONIC_FULL_VERSION_BEGIN5.3SUBSONIC_FULL_VERSION_END

-

SUBSONIC_BETA_VERSION_BEGIN1.0.beta2SUBSONIC_BETA_VERSION_END

+

SUBSONIC_BETA_VERSION_BEGIN1.0.beta3SUBSONIC_BETA_VERSION_END

SUBSONIC_ANDROID_VERSION_BEGIN1.7.1SUBSONIC_ANDROID_VERSION_END