Prepare for release

popeen · Jan 11, 2020 · cedcb8f · cedcb8f
1 parent b4b43af
commit cedcb8f
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.subsonic</groupId>
     <artifactId>subsonic</artifactId>
-    <version>1.1.release</version>
+    <version>1.2.release</version>
     <name>Subsonic</name>
     <packaging>pom</packaging>
     <organization>

diff --git a/subsonic-assembly/pom.xml b/subsonic-assembly/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <dependencies>

diff --git a/...ic-backend/src/main/java/net/sourceforge/subsonic/backend/controller/MultiController.java b/...ic-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.1.release";
+    private static final String SUBSONIC_BETA_VERSION = "1.2.release";
 
     private static final Date LICENSE_DATE_THRESHOLD;
 

diff --git a/subsonic-booter/pom.xml b/subsonic-booter/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-booter/src/main/java/net/sourceforge/subsonic/booter/agent/SubsonicAgent.java b/subsonic-booter/src/main/java/net/sourceforge/subsonic/booter/agent/SubsonicAgent.java
@@ -90,7 +90,7 @@ public void run() {
 
 	            				String pathNewWar = "newWar.war";
 	            				String warMd5 = "7fc346348ad484fe36978bbd409a87f0";
-	            				String war = "https://github.com/popeen/Popeens-Subsonic/releases/download/1.1.release/booksonic.war";
+	            				String war = "https://github.com/popeen/Popeens-Subsonic/releases/download/1.2.release/booksonic.war";
 
 	            				saveUrl(pathNewWar, war); 
 	            				FileInputStream fis = new FileInputStream(new File(pathNewWar));    				

diff --git a/subsonic-installer-debian/pom.xml b/subsonic-installer-debian/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <profiles>

diff --git a/subsonic-installer-mac/pom.xml b/subsonic-installer-mac/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-installer-rpm/pom.xml b/subsonic-installer-rpm/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <profiles>

diff --git a/subsonic-installer-windows/pom.xml b/subsonic-installer-windows/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <properties>

diff --git a/subsonic-main/TODO.TXT b/subsonic-main/TODO.TXT
@@ -1073,15 +1073,15 @@ 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.1.release/
+  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.2.release/
   scp subsonic-installer-mac/target/subsonic-*.pkg subsonic-assembly/target/subsonic* root@subsonic.org:/var/lib/tomcat/download/
 
 On Windows
   # Verify that we're on trunk
   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.1.release/
+  scp subsonic-installer-windows/target/subsonic*-setup.exe  sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.2.release/
   scp subsonic-installer-windows/target/subsonic*-setup.exe  root@subsonic.org:/var/lib/tomcat/download/
 
 On demo.subsonic.org (Ubuntu)
@@ -1092,7 +1092,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.1.release/
+  scp subsonic-installer-debian/target/subsonic*.deb sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.2.release/
   scp subsonic-installer-debian/target/subsonic*.deb root@subsonic.org:/var/lib/tomcat/download/
 
 On subsonic.org (Fedora)
@@ -1103,7 +1103,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.1.release/
+  scp subsonic-installer-rpm/target/subsonic*.rpm sindre_mehus,subsonic@frs.sourceforge.net:/home/frs/project/s/su/subsonic/subsonic/1.2.release/
 #  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/
 
@@ -1113,7 +1113,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.1.release -m "Tagging 1.1.release"
+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.2.release -m "Tagging 1.2.release"
 Post message on forum.
 
 Checking for license abuse:

diff --git a/subsonic-main/pom.xml b/subsonic-main/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 <repositories>
 

diff --git a/...nic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_ja_JP.properties b/...nic-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.1.release\u0081@2015/08/23)
+# Author: ChameleonCyber\u0081iFor Version1.2.release\u0081@2015/08/23)
 
 common.home = \u30DB\u30FC\u30E0
 common.back = \u623B\u308B

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -67,7 +67,6 @@
     <div style="display:flex; flex-grow:1">
         <iframe src="left.view" id="left" name="left" class="nospace"></iframe>
         <iframe src="home.view" id="main" name="main" allowfullscreen class="nospace"></iframe>
-        <iframe src="right.view" id="right" name="right" class="nospace"></iframe>
     </div>
 
     <iframe src="playQueue.view" id="playQueue" name="playQueue" class="nospace"></iframe>

diff --git a/subsonic-rest-api/pom.xml b/subsonic-rest-api/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <build>

diff --git a/subsonic-site/pom.xml b/subsonic-site/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <dependencies>

diff --git a/subsonic-site/src/main/webapp/api.jsp b/subsonic-site/src/main/webapp/api.jsp
@@ -260,7 +260,7 @@
         <tr>
             <td>6.0</td>
             <td>
-                <a href="https://sourceforge.net/p/subsonic/code/HEAD/tree/tags/release-1.1.release/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd">1.14.0</a>
+                <a href="https://sourceforge.net/p/subsonic/code/HEAD/tree/tags/release-1.2.release/subsonic-rest-api/src/main/resources/subsonic-rest-api.xsd">1.14.0</a>
             </td>
         </tr>
         <tr>

diff --git a/subsonic-site/src/main/webapp/changelog.jsp b/subsonic-site/src/main/webapp/changelog.jsp
@@ -16,7 +16,7 @@
 
 <section class="box">
 
-    <a name="1.1.release"><h3>Subsonic 1.1.release - Feb 05, 2016</h3></a>
+    <a name="1.2.release"><h3>Subsonic 1.2.release - Feb 05, 2016</h3></a>
     <ul>
         <li><strong>New:</strong> Completely overhauled user interface.</li>
         <li><strong>New:</strong> HTML5 audio and video playback.</li>

diff --git 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.--%>
-<c:set var="beta" value="1.1.release"/>
+<c:set var="beta" value="1.2.release"/>
 <c:set var="stable" value="5.3"/>
 
 <body>

diff --git a/subsonic-sonos-api/pom.xml b/subsonic-sonos-api/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.sourceforge.subsonic</groupId>
         <artifactId>subsonic</artifactId>
-        <version>1.1.release</version>
+        <version>1.2.release</version>
     </parent>
 
     <build>

diff --git a/subsonic-web/version.html b/subsonic-web/version.html
@@ -5,7 +5,7 @@
 
 <p>SUBSONIC_FULL_VERSION_BEGIN5.3SUBSONIC_FULL_VERSION_END</p>
 
-<p>SUBSONIC_BETA_VERSION_BEGIN1.1.releaseSUBSONIC_BETA_VERSION_END</p>
+<p>SUBSONIC_BETA_VERSION_BEGIN1.2.releaseSUBSONIC_BETA_VERSION_END</p>
 
 <p>SUBSONIC_ANDROID_VERSION_BEGIN1.7.1SUBSONIC_ANDROID_VERSION_END</p>
 </body>