v109.0.0 RELEASE

CHANGELOG.md

@@ -3,17 +3,39 @@
 # jpsonic/jpsonic
 # -->
 
-## v108.0.0
-#### Based on *airsonic 10.6.0-RELEASE*
+## v109.0.0
+#### Based on *airsonic 11.0.0-SNAPSHOT 5c71659*
+
+> Includes bug fixes for 10.6.1 and 10.6.2. Does not include updates to HSQLDB.
+> 
+> [eb4c5a0]
+> 
+>  - Update Sonos wsdl file
+>  - Refactor transcoding/downsampling bitrate limits
+>  - Change the default naming convention for podcasts
+>  - Update spring-boot to 2.2
+>  - Fixed a bug that the play button on the web does not start playing
+>  - Fix Last.FM scrobbling on AudioScrobbler API v1
+>  - Fix path issue on Windows(internal diagnostics page)
+>  - Fix UTF-8 detection on some systems using non-standard locales(internal diagnostics page)
+> 
+> In addition, library updates etc. 
+
+  * [fix] Updated apache-jsp to 9.4.28.v20200408(CVE-2020-1745). Compiling with the Tomcat profile is not affected.
+  * [update] Support for phrase search.
+
+<details>
+<summary>v108.0.0 based on airsonic 10.6.0-RELEASE</summary>
 
   * [fix] Update jquery to 3.5.
   * [fix] Fixed share psge icon image and link.
   * [update] Removed artist image from biography on Web page.
     Because this is not a proper implementation under Japanese law.
     If a better solution is implemented in the future, it will be modified again to display the image.
+</details>
 
-## v107.2.0
-#### Based on *airsonic 10.6.0-SNAPSHOT 80ccd82*
+<details>
+<summary>v107.2.0 based on airsonic 10.6.0-SNAPSHOT 80ccd82</summary>
 
   * [fix] Update Jetty to 9.4.27.v20200227 (CVE-2020-1935).
   * [fix] Update Jackson to 2.10.3 (CVE-2020-8840, CVE-2019-20330)
@@ -45,6 +67,7 @@
     Because this is not a proper implementation under Japanese law.
     In later versions, the same policy will also remove images of artists located except for UPnP.
     If a better solution is implemented in the future, it will be modified again to display the image.
+</details>
 
 <details>
 <summary>v107.1.0 based on airsonic 10.6.0-SNAPSHOT 80ccd82</summary>

README.md

@@ -125,17 +125,20 @@ These are done automatically after the scan.
 </details>
 
 <details>
-<summary>Japanese searchable</summary>
+<summary>Enhanced search function</summary>
 
 <table>
 <tr>
 <td>
+Supports phrase search.
+In addition, the sort tags corresponding to each field will also be searched.
 
-In addition to regular Japanese phrase search, artists can also use phonetic search and forward match.
-
-Generally, Japanese people unconsciously input 'Reading' and then convert them into appropriate character types by IME conversion.
-Jpsonic enables searching during Japanese translation.
+When searching, Japanese people enter the reading.
+Finally, convert to an appropriate character type with IME conversion.
+People in the countries that use Ideograph unknowingly perform complicated input procedures.
+Jpsonic allows you to search while inputting IME conversion.
 
+In addition to the phrase search, the old Subsonic search, the multi term search, is also maintained. It can be switched by the option.
 </td>
 <td>
 <img src="contrib/assets/jp-search.jpg" width="200">

contrib/airsonic.service

@@ -15,7 +15,7 @@ EnvironmentFile=-/etc/sysconfig/jpsonic
 ExecStart=/usr/bin/java \
           $JAVA_OPTS \
           -Djpsonic.home=${JPSONIC_HOME} \
-          -Dserver.context-path=${CONTEXT_PATH} \
+          -Dserver.servlet.contextPath=${CONTEXT_PATH} \
           -Dserver.port=${PORT} \
           -jar ${JAVA_JAR} $JAVA_ARGS
 User=jpsonic

install/docker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <relativePath>../../pom.xml</relativePath>
         <artifactId>jpsonic</artifactId>
-        <version>10.6.0-RELEASE</version>
+        <version>11.0.0-SNAPSHOT</version>
         <groupId>com.tesshu.jpsonic.player</groupId>
     </parent>
     <packaging>pom</packaging>
@@ -16,38 +16,38 @@
         <dependency>
             <groupId>com.tesshu.jpsonic.player</groupId>
             <artifactId>jpsonic-main</artifactId>
-            <version>10.6.0-RELEASE</version>
+            <version>11.0.0-SNAPSHOT</version>
             <type>war</type>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.13</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.spotify</groupId>
-                        <artifactId>docker-client</artifactId>
-                        <version>8.16.0</version>
-                    </dependency>
-                </dependencies>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.33.0</version>
                 <executions>
                     <execution>
-                        <id>default</id>
+                        <id>build-image</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>build</goal>
                         </goals>
-                        <phase>package</phase>
+                        <configuration>
+                            <showLogs>true</showLogs>
+                            <images>
+                                <image>
+                                    <name>${docker.container.repo}</name>
+                                    <build>
+                                        <dockerFile>${project.basedir}/Dockerfile</dockerFile>
+                                        <tags>latest</tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <repository>jpsonic/jpsonic</repository>
-                    <tag>${project.version}</tag>
-                    <retryCount>0</retryCount>
-                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>

install/keys/README.md

@@ -0,0 +1,25 @@
+This directory contains GPG signing keys used to sign and verify Airsonic
+releases.
+
+To sign a new release after a successful build:
+
+  $ gpg --clearsign airsonic-main/target/artifacts-checksums.sha
+
+To verify a release:
+
+  $ gpg --verify artifacts-checksums.sha.asc
+  gpg: Signature made Fri 01 May 2020 12:45:09 PM CEST
+  gpg:                using RSA key 262121A22A609283A6A46BCB7DEEDDBFC5A13AB4
+  gpg: Good signature from "François-Xavier Thomas (Git signing key) <fxthomas@users.noreply.github.com>" [ultimate]
+
+To sign a key for adding a new maintainer (replace key id with the one you want
+to sign):
+
+  $ gpg --sign-key 262121A22A609283A6A46BCB7DEEDDBFC5A13AB4
+  $ gpg --send-keys 262121A22A609283A6A46BCB7DEEDDBFC5A13AB4
+  $ gpg --keyserver pgp.mit.edu --send-keys 262121A22A609283A6A46BCB7DEEDDBFC5A13AB4
+  $ gpg --keyserver keyserver.ubuntu.com --send-keys 262121A22A609283A6A46BCB7DEEDDBFC5A13AB4
+
+To export a key in the repo:
+
+  $ gpg --export --armor 262121A22A609283A6A46BCB7DEEDDBFC5A13AB4 > install/keys/<email>.pem

install/keys/fxthomas@users.noreply.github.com.pem

@@ -0,0 +1,53 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+6+rFf5U=
+=zARU
+-----END PGP PUBLIC KEY BLOCK-----

install/keys/lostonamountain@gmail.com.pem

@@ -0,0 +1,121 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+ojE=
+=kNrm
+-----END PGP PUBLIC KEY BLOCK-----

jpsonic-main/cve-suppressed.xml

@@ -31,6 +31,11 @@
         <gav regex="true">^org\.mortbay\.jasper:apache-jsp:.*$</gav>
        <cve>CVE-2019-17569</cve>
     </suppress>
+    <suppress>
+       <notes><![CDATA[This threat will be ignored if the user voluntarily compiles with Jetty plofile]]></notes>
+        <gav regex="true">^org\.mortbay\.jasper:apache-jsp:.*$</gav>
+       <cve>CVE-2020-1745</cve>
+    </suppress>
     <!-- << Jpsonic -->
 
     <suppress>