add "Browse button" for add local cover

CHANGELOG.md

@@ -3,6 +3,74 @@
 # airsonic/airsonic
 # -->
 
+## v10.6.2 - 3 May 2020
+
+### Fixes
+
+* Last.fm scrobbling should be working again (#1655)
+* Incomplete support for some platforms in the internal diagnostics page (#1641, #1664)
+
+## v10.6.1 - 19 Apr 2020
+
+### Fixes
+
+* Fix issue with DLNA not working (#1634)
+* Fix issue with scanning error on some media types (e.g. WAV) (#1626)
+
+## v10.6.0 - 15 Apr 2020
+
+### New features
+
+* Support for sending scrobbling information to the "ListenBrainz" service has
+  been added (#1224)
+
+* A new "More" link has been added to the "About" page, containing detailed
+  system diagnostic information. This page will help us diagnose issues more
+  easily in the future. (#1457)
+
+* The default 'admin' user can now be deleted if another admin user is present
+  on the system, which can improve security by avoiding having a hardcoded
+  username always available. Features that require an admin user (namely,
+  automated playlist import) will use the first admin user in the database. (#1131)
+
+* The play queue can now be toggled on/off with a button, which helps use
+  Airsonic on touch devices (tablets, ultrabooks). (#1539)
+
+* An 'add to play queue' action has been added to playlist pages. (#1433)
+
+### Fixes and updates
+
+* External database drivers have been updated to more recent versions. In
+  particular, the MySQL driver now supports MySQL 8.0, and initial migrations
+  on PostgreSQL should work properly again. (#1452 and #1511)
+
+* The seek support for transcoding has now been re-enabled again, now that
+  we're more confident that this works fine with the HTML5 player. (#1123)
+
+* Accuracy of the "search" feature has been improved, with search now ranking
+  by artist (resp. album or song) name in the artists (resp. albums or songs)
+  category. (#1235)
+
+* The systemd example file has been updated with a couple of changes related to
+  device/driver access. (#1406)
+
+* DLNA support should now be exposed properly through Docker, which wasn't the
+  case before. (#1380)
+
+* The tabs on the main page no longer auto-refresh at regular intervals.
+  Instead a "refresh" link is available to trigger a reload manually. (#1338 #1339 #1413)
+
+### Others
+
+* The dark theme has seen some tweaks.
+* Fix harmless error message about missing "web.xml"
+* Fix not to perform clean up during scan
+* Change to new shuffle generator
+* The `pt_BR` locale has been updated.
+* Avoid exceptions if Lucene index is not ready on first startup
+* Avoid exceptions if database is not ready and fully migrated on first startup
+* A lot of dependency upgrades, as well as other fixes and optimizations
+
 ## v10.5.0 - 7 Nov 2019
 
 **New index version. Scan will be triggered on startup**

README.md

@@ -10,6 +10,10 @@ Airsonic
 [![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/airsonic/airsonic.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/airsonic/airsonic/context:java)
 [![codecov.io coverage](https://codecov.io/gh/airsonic/airsonic/branch/master/graph/badge.svg)](https://codecov.io/gh/airsonic/airsonic)
 
+## Airsonic isn't maintained anymore, you should migrate to [airsonic-advanced](https://github.com/airsonic-advanced/airsonic-advanced) instead.
+
+---
+
 What is Airsonic?
 -----------------
 

airsonic-main/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.airsonic.player</groupId>
         <artifactId>airsonic</artifactId>
-        <version>10.6.0-SNAPSHOT</version>
+        <version>11.0.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -58,6 +58,10 @@
             <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-jmx</artifactId>
+        </dependency>
         <!-- END Metrics -->
 
         <!-- Spring -->
@@ -72,9 +76,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
-            <version>2.3.3</version>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+            <version>2.3.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -102,7 +106,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.10.0</version>
+            <version>3.10.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.ldap</groupId>
@@ -131,12 +135,12 @@
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-core</artifactId>
-            <version>8.4.1</version>
+            <version>8.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
             <artifactId>lucene-analyzers-common</artifactId>
-            <version>8.4.1</version>
+            <version>8.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
@@ -219,9 +223,9 @@
         </dependency>
 
         <dependency>
-            <groupId>hsqldb</groupId>
+            <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>1.8.0.7</version>
+            <version>2.5.0</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -289,8 +293,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -307,8 +311,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
         </dependency>
 
         <dependency>
@@ -344,12 +348,16 @@
         <dependency>
             <groupId>org.fourthline.cling</groupId>
             <artifactId>cling-core</artifactId>
+            <!-- Cling removed the org.fourthline.cling.transport.impl.apache package in 2.1, which is needed to make Cling work with Tomcat. -->
+            <!-- Don't upgrade this unless you can test UPnP/DLNA support properly! -->
             <version>2.0.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.fourthline.cling</groupId>
             <artifactId>cling-support</artifactId>
+            <!-- Cling removed the org.fourthline.cling.transport.impl.apache package in 2.1, which is needed to make Cling work with Tomcat. -->
+            <!-- Don't upgrade this unless you can test UPnP/DLNA support properly! -->
             <version>2.0.1</version>
         </dependency>
 
@@ -368,7 +376,7 @@
         <dependency>
             <groupId>de.triology.recaptchav2-java</groupId>
             <artifactId>recaptchav2-java</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.4</version>
         </dependency>
 
         <!-- SONOS API / WSDL SUPPORT -->
@@ -491,8 +499,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -522,17 +530,17 @@
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <artifactId>jakarta.mail</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
+            <groupId>jakarta.xml.ws</groupId>
+            <artifactId>jakarta.xml.ws-api</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -542,13 +550,11 @@
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.2</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.10</version>
+            <version>42.2.12</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -560,12 +566,12 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.5.4</version>
+            <version>2.6.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -598,7 +604,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.20.RELEASE</version>
+                <version>2.2.7.RELEASE</version>
                 <configuration>
                     <mainClass>org.airsonic.player.Application</mainClass>
                     <layout>WAR</layout>
@@ -615,6 +621,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <skip>${surefire.skip}</skip>
                     <reuseForks>false</reuseForks>
                 </configuration>
             </plugin>
@@ -669,7 +676,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-jspc-maven-plugin</artifactId>
-                <version>9.4.26.v20200117</version>
+                <version>9.4.28.v20200408</version>
                 <executions>
                     <execution>
                         <id>jspc</id>

airsonic-main/src/main/java/org/airsonic/player/Application.java

@@ -1,22 +1,26 @@
 package org.airsonic.player;
 
 import org.airsonic.player.filter.*;
+import org.airsonic.player.util.LegacyHsqlUtil;
 import org.directwebremoting.servlet.DwrServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.MultipartAutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.boot.context.event.ApplicationPreparedEvent;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.ReflectionUtils;
 
@@ -31,7 +35,7 @@
         DataSourceTransactionManagerAutoConfiguration.class,
         MultipartAutoConfiguration.class, // TODO: update to use spring boot builtin multipart support
         LiquibaseAutoConfiguration.class})
-public class Application extends SpringBootServletInitializer implements EmbeddedServletContainerCustomizer {
+public class Application extends SpringBootServletInitializer implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
 
     private static final Logger LOG = LoggerFactory.getLogger(Application.class);
 
@@ -162,10 +166,17 @@ public Filter noCacheFilter() {
     }
 
     private static SpringApplicationBuilder doConfigure(SpringApplicationBuilder application) {
+        // Handle HSQLDB database upgrades from 1.8 to 2.x before any beans are started.
+        application.application().addListeners((ApplicationListener<ApplicationPreparedEvent>) event -> {
+            if (event.getApplicationContext().getEnvironment().acceptsProfiles("legacy")) {
+                LegacyHsqlUtil.upgradeHsqldbDatabaseSafely();
+            }
+        });
+
         // Customize the application or call application.sources(...) to add sources
         // Since our example is itself a @Configuration class (via @SpringBootApplication)
         // we actually don't need to override this method.
-        return application.sources(Application.class).web(true);
+        return application.sources(Application.class).web(WebApplicationType.SERVLET);
     }
 
     @Override
@@ -174,15 +185,15 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio
     }
 
     @Override
-    public void customize(ConfigurableEmbeddedServletContainer container) {
+    public void customize(ConfigurableServletWebServerFactory container) {
         LOG.trace("Servlet container is {}", container.getClass().getCanonicalName());
         // Yes, there is a good reason we do this.
         // We cannot count on the tomcat classes being on the classpath which will
         // happen if the war is deployed to another app server like Jetty. So, we
         // ensure this class does not have any direct dependencies on any Tomcat
         // specific classes.
         try {
-            Class<?> tomcatESCF = Class.forName("org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory");
+            Class<?> tomcatESCF = Class.forName("org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory");
             if (tomcatESCF.isInstance(container)) {
                 LOG.info("Detected Tomcat web server");
                 LOG.debug("Attempting to optimize tomcat");

airsonic-main/src/main/java/org/airsonic/player/TomcatApplication.java

@@ -4,14 +4,13 @@
 import org.apache.catalina.Wrapper;
 import org.apache.catalina.webresources.StandardRoot;
 import org.apache.tomcat.util.scan.StandardJarScanFilter;
-import org.springframework.boot.context.embedded.tomcat.TomcatContextCustomizer;
-import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 
 public class TomcatApplication {
 
-    public static void configure(TomcatEmbeddedServletContainerFactory tomcatFactory) {
+    public static void configure(TomcatServletWebServerFactory tomcatFactory) {
 
-        tomcatFactory.addContextCustomizers((TomcatContextCustomizer) context -> {
+        tomcatFactory.addContextCustomizers(context -> {
 
             StandardJarScanFilter standardJarScanFilter = new StandardJarScanFilter();
             standardJarScanFilter.setTldScan("dwr-*.jar,jstl-*.jar,spring-security-taglibs-*.jar,spring-web-*.jar,spring-webmvc-*.jar,string-*.jar,taglibs-standard-impl-*.jar,tomcat-annotations-api-*.jar,tomcat-embed-jasper-*.jar");