diff --git a/pom.xml b/pom.xml index 1461fbf..e4c23ee 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ confapi-crowd-plugin - 0.0.10-SNAPSHOT + 0.1.0-SNAPSHOT atlassian-plugin ConfAPI for Crowd @@ -60,14 +60,14 @@ - 4.4.0 + 5.1.3 4.4.0 8409 8.0.2 ${project.groupId}.${project.artifactId} 2.1.5 - 0.0.34-SNAPSHOT - 1.2.3 + 0.0.34 + 2.0.1 @@ -112,6 +112,7 @@ org.projectlombok lombok + 1.18.28 provided @@ -120,28 +121,24 @@ com.atlassian.crowd crowd-api - ${crowd.version} provided com.atlassian.crowd crowd-core - ${crowd.version} provided com.atlassian.crowd crowd-rest-plugin - ${crowd.version} provided com.atlassian.scheduler atlassian-scheduler-quartz1 - 2.0.0 provided @@ -201,6 +198,19 @@ provided + + javax.xml.bind + jaxb-api + provided + + + + jakarta.validation + jakarta.validation-api + 2.0.2 + provided + + @@ -214,19 +224,22 @@ junit junit - provided + 4.13.2 + test org.mockito mockito-core - provided + 1.10.19 + test org.hamcrest hamcrest-core - provided + 1.3 + test @@ -238,15 +251,14 @@ com.atlassian.crowd crowd-test-utils - ${crowd.version} - provided + test com.atlassian.plugins atlassian-plugins-osgi-testrunner ${plugin.testrunner.version} - provided + test junit @@ -285,14 +297,6 @@ * - - - compile - - copy-bundled-dependencies - - - @@ -307,6 +311,15 @@ + + + + com.atlassian.plugin + atlassian-spring-scanner-external-jar + + + false + diff --git a/src/main/resources/META-INF/spring/plugin-context.xml b/src/main/resources/META-INF/spring/plugin-context.xml index d91305f..de074e8 100644 --- a/src/main/resources/META-INF/spring/plugin-context.xml +++ b/src/main/resources/META-INF/spring/plugin-context.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:atlassian-scanner="http://www.atlassian.com/schema/atlassian-scanner/2" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd - http://www.atlassian.com/schema/atlassian-scanner/2 - http://www.atlassian.com/schema/atlassian-scanner/2/atlassian-scanner.xsd"> + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.atlassian.com/schema/atlassian-scanner + http://www.atlassian.com/schema/atlassian-scanner/atlassian-scanner.xsd">