diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2020-06-28 21:20:18 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2020-06-28 21:20:18 +0200 |
| commit | 827bd5d95ed7ba369b7d6e4dce8ed1b65af2909a (patch) | |
| tree | f07dce6b4f75b8b6a0fdf3dd5bd531051a72ee1a | |
| parent | 622ebf3c5b46bc7105877619e8102dc496a79785 (diff) | |
| download | archiva-827bd5d95ed7ba369b7d6e4dce8ed1b65af2909a.tar.gz archiva-827bd5d95ed7ba369b7d6e4dce8ed1b65af2909a.zip | |
Fix for JDK 11
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml | 5 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/pom.xml | 6 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webdav/pom.xml | 6 | ||||
| -rw-r--r-- | pom.xml | 10 |
4 files changed, 25 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index aefc4415e..a5c914b83 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -436,6 +436,11 @@ <artifactId>javax.annotation-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> + </dependency> </dependencies> diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index d60eff6df..15535cd8b 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -514,7 +514,11 @@ <artifactId>jaxb-api</artifactId> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> + </dependency> </dependencies> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index d75fb79aa..4aa03443a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -402,12 +402,16 @@ <artifactId>javax.annotation-api</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>test</scope> + </dependency> <!-- END Needed for JDK >= 9 --> </dependencies> @@ -102,6 +102,8 @@ <joda.time.version>1.5.2</joda.time.version> + <glassfish.jaxb.version>2.3.3</glassfish.jaxb.version> + <!-- restore when we will be able to use a derby in memory database --> <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> @@ -1493,6 +1495,8 @@ <version>${jsoup.version}</version> </dependency> + + <!-- Used by Apache Cassandra as transitive dependency --> <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging</artifactId> @@ -1500,6 +1504,12 @@ </dependency> <!-- Dependencies for JDK >=9 update --> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${glassfish.jaxb.version}</version> + </dependency> + <!-- END - Dependencies for JDK >=9 update --> <dependency> <groupId>com.rometools</groupId> |