aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2020-06-22 20:54:14 +0200
committerMartin Stockhammer <martin_s@apache.org>2020-06-22 20:54:14 +0200
commit6d5d91d2b02e019b9446ee334561c82c01975e5f (patch)
tree35f37610c25e3afc2cfb9ef117bd1c6ad286e799
parent167c3358564295ec3e28113bb9242d28500674ea (diff)
downloadarchiva-6d5d91d2b02e019b9446ee334561c82c01975e5f.tar.gz
archiva-6d5d91d2b02e019b9446ee334561c82c01975e5f.zip
Dependency cleanup of rest-api
-rw-r--r--archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml17
-rw-r--r--pom.xml7
-rw-r--r--status-dep.txt4
3 files changed, 14 insertions, 14 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index 9a64d1d50..5a62d7ea6 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -60,10 +60,7 @@
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-scanner</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>repository-statistics</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-statistics-api</artifactId>
@@ -116,18 +113,12 @@
</exclusion>
</exclusions>
</dependency>
-
-
- <!-- normally not needed but here for wadl feature currently in cxf -->
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
+
</dependencies>
diff --git a/pom.xml b/pom.xml
index 877c6ab72..de753ba86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1859,8 +1859,13 @@
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.3</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/status-dep.txt b/status-dep.txt
index 1651becd4..9c0428a45 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -57,6 +57,10 @@ archiva-modules
problem-reports
repository-statistics
stage-repository-merge
+
+ archiva-web
+ archiva-rest
+ archiva-rest-api