Merge remote-tracking branch 'origin/pr/1038'

airsonic-main/cve-suppressed.xml

@@ -163,4 +163,9 @@
        <gav regex="true">.*spring.*</gav>
        <cve>CVE-2018-1258</cve>
     </suppress>
+    <suppress>
+        <notes>This is for an unrelated C library</notes>
+        <gav regex="true">^com\.sun\.xml\.bind\.external:relaxng-datatype:.*</gav>
+        <cve>CVE-2018-18749</cve>
+    </suppress>
 </suppressions>

airsonic-main/pom.xml

@@ -134,17 +134,9 @@
             <version>3.0.3</version>
         </dependency>
 
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-            <version>3.2.10</version>
-            <scope>runtime</scope>
-        </dependency>
-        
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.10.3</version>
             <scope>runtime</scope>
         </dependency>
 
@@ -517,6 +509,26 @@
             <artifactId>javax.mail</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <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>

airsonic-main/src/test/java/org/airsonic/player/api/jukebox/AbstractAirsonicRestApiJukeboxIntTest.java

@@ -151,7 +151,7 @@ public abstract class AbstractAirsonicRestApiJukeboxIntTest {
     }
 
     private String convertDateToString(Date date) {
-       SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.000'Z'");
+       SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
        formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
        return formatter.format(date);
     }