yetangitu/airsonic
1
0
Fork 0
mirror of https://github.com/airsonic/airsonic.git synced 2025-10-03 17:59:25 +02:00
Code Issues Releases Wiki Activity

Update core dependencies for Spring Boot 2.2

Browse source
This commit is contained in:
François-Xavier Thomas 2020-01-02 00:32:12 +01:00
parent c7b091b8ab
commit 0af56013a5
4 changed files with 48 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

36
airsonic-main/pom.xml
View file

@ -58,6 +58,10 @@
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId> <artifactId>metrics-core</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-jmx</artifactId>
</dependency>
<!-- END Metrics --> <!-- END Metrics -->
<!-- Spring --> <!-- Spring -->
@ -72,9 +76,9 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet.jsp</groupId> <groupId>jakarta.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId> <artifactId>jakarta.servlet.jsp-api</artifactId>
<version>2.3.3</version> <version>2.3.6</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -289,8 +293,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>jakarta.servlet</groupId>
<artifactId>javax.servlet-api</artifactId> <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -307,8 +311,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>jakarta.mail</groupId>
<artifactId>javax.mail-api</artifactId> <artifactId>jakarta.mail-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -491,8 +495,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>jakarta.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>jakarta.validation-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -522,17 +526,17 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>jakarta.mail</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.annotation</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.ws</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>jaxws-api</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
@ -542,8 +546,6 @@
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>
@ -565,7 +567,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

12
airsonic-sonos-api/pom.xml
View file

@ -13,16 +13,16 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.ws</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>jaxws-api</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.jws</groupId> <groupId>jakarta.jws</groupId>
<artifactId>javax.jws-api</artifactId> <artifactId>jakarta.jws-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

47
pom.xml
View file

@ -85,7 +85,7 @@
<!-- Import dependency management from Spring Boot --> <!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
<version>1.5.22.RELEASE</version> <version>2.2.4.RELEASE</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -138,9 +138,9 @@
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.annotation</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>javax.annotation-api</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<version>1.3.2</version> <version>1.3.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jvnet.staxex</groupId> <groupId>org.jvnet.staxex</groupId>
@ -150,34 +150,29 @@
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.2</version> <version>2.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.ws</groupId> <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxws-api</artifactId> <artifactId>jaxb-runtime</artifactId>
<version>2.3.1</version> <version>2.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.xml.soap</groupId> <groupId>jakarta.xml.ws</groupId>
<artifactId>javax.xml.soap-api</artifactId> <artifactId>jakarta.xml.ws-api</artifactId>
<version>1.4.0</version> <version>2.3.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.jws</groupId> <groupId>jakarta.xml.soap</groupId>
<artifactId>javax.jws-api</artifactId> <artifactId>jakarta.xml.soap-api</artifactId>
<version>1.1</version> <version>1.4.1</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>1.1.1</version>
</dependency> </dependency>
<!-- Tomcat dependencies are normally managed by Spring Boot, but we handle <!-- Tomcat dependencies are normally managed by Spring Boot, but we handle
@ -427,7 +422,7 @@
<ignoredUsedUndeclaredDependency>org.apache.tomcat.embed:tomcat-embed-el*</ignoredUsedUndeclaredDependency> <ignoredUsedUndeclaredDependency>org.apache.tomcat.embed:tomcat-embed-el*</ignoredUsedUndeclaredDependency>
</ignoredUsedUndeclaredDependencies> </ignoredUsedUndeclaredDependencies>
<ignoredUnusedDeclaredDependencies> <ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>com.sun.mail:javax.mail*</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>com.sun.mail:jakarta.mail*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.seamless:seamless-http*</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.seamless:seamless-http*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>taglibs:string:jar*</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>taglibs:string:jar*</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>org.seamless:seamless-http*</ignoredUnusedDeclaredDependency> <ignoredUnusedDeclaredDependency>org.seamless:seamless-http*</ignoredUnusedDeclaredDependency>

4
subsonic-rest-api/pom.xml
View file

@ -13,8 +13,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>