Fix #611 Add support for Java 9 and greater

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
master
Andrew DeMaria 6 years ago
parent 2162250101
commit df352d8cb0
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 3
      .travis.yml
  2. 5
      airsonic-main/cve-suppressed.xml
  3. 28
      airsonic-main/pom.xml
  4. 2
      airsonic-main/src/test/java/org/airsonic/player/api/jukebox/AbstractAirsonicRestApiJukeboxIntTest.java
  5. 15
      airsonic-sonos-api/pom.xml
  6. 50
      pom.xml
  7. 7
      subsonic-rest-api/pom.xml

@ -9,6 +9,5 @@ matrix:
include: include:
- jdk: oraclejdk8 - jdk: oraclejdk8
- jdk: oraclejdk9 - jdk: oraclejdk9
allow_failures: - jdk: oraclejdk11
- jdk: oraclejdk9

@ -163,4 +163,9 @@
<gav regex="true">.*spring.*</gav> <gav regex="true">.*spring.*</gav>
<cve>CVE-2018-1258</cve> <cve>CVE-2018-1258</cve>
</suppress> </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> </suppressions>

@ -134,17 +134,9 @@
<version>3.0.3</version> <version>3.0.3</version>
</dependency> </dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.2.10</version>
<scope>runtime</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.10.3</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
@ -517,6 +509,26 @@
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </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> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId> <artifactId>postgresql</artifactId>

@ -151,7 +151,7 @@ public abstract class AbstractAirsonicRestApiJukeboxIntTest {
} }
private String convertDateToString(Date date) { 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")); formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
return formatter.format(date); return formatter.format(date);
} }

@ -11,6 +11,21 @@
<version>10.3.0-SNAPSHOT</version> <version>10.3.0-SNAPSHOT</version>
</parent> </parent>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

@ -16,7 +16,7 @@
<properties> <properties>
<failOnDependencyWarning>true</failOnDependencyWarning> <failOnDependencyWarning>true</failOnDependencyWarning>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.2.6</cxf.version> <cxf.version>3.3.1</cxf.version>
<jackson.version>2.9.8</jackson.version> <jackson.version>2.9.8</jackson.version>
</properties> </properties>
@ -139,6 +139,54 @@
<version>3.14.0</version> <version>3.14.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.jvnet.staxex</groupId>
<artifactId>stax-ex</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>1.1</version>
</dependency>
<!-- Remove once spring boot is updated --> <!-- Remove once spring boot is updated -->
<dependency> <dependency>

@ -11,6 +11,13 @@
<version>10.3.0-SNAPSHOT</version> <version>10.3.0-SNAPSHOT</version>
</parent> </parent>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

Loading…
Cancel
Save