MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'airsonic/pr/849'

Browse Source 
Conflicts:
	airsonic-main/cve-suppressed.xml
	airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
	airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
	pom.xml
This commit is contained in:
Andrew DeMaria
2019-03-16 19:27:53 -04:00
parent 0d78c30d06 94f4a85bb7
commit 143a220719
12 changed files with 63 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-test/pom.xml
+4 -5
View File
@@ -13,7 +13,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cucumber.version>2.3.1</cucumber.version>
<cucumber.version>4.2.0</cucumber.version>
</properties>
<dependencies>
@@ -59,7 +59,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -90,7 +89,7 @@
<dependency>
<groupId>com.spotify</groupId>
<artifactId>docker-client</artifactId>
<version>8.13.1</version>
<version>8.14.5</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -116,13 +115,13 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.6.0</version>
<version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<version>2.6.0</version>
<version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>