diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-08-07 18:12:39 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-08-07 18:12:39 +0000 |
| commit | 0bda5f046513a3350bb783b3f963a3b7223aa03f (patch) | |
| tree | f88fc09cf469df70575782b2c4cd67ac515644f6 /archiva-modules | |
| parent | 729f7da56ed26459b138527a40e4d2080924d909 (diff) | |
| download | archiva-0bda5f046513a3350bb783b3f963a3b7223aa03f.tar.gz archiva-0bda5f046513a3350bb783b3f963a3b7223aa03f.zip | |
no more need of jaxb-api we are now 1.6 required
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370410 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
5 files changed, 8 insertions, 19 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml index 333750632..6be2c8763 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml @@ -30,10 +30,6 @@ <name>Archiva Base :: Repository Admin Api</name> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> </dependency> diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index 6f82df254..953882646 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -30,10 +30,6 @@ <name>Archiva Base :: Repository Scanner</name> <dependencies> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-consumer-api</artifactId> </dependency> 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 5918e31dc..01ae14bb1 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 @@ -76,10 +76,6 @@ </exclusions> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index d382a7446..4bc65784e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -668,6 +668,14 @@ <artifactId>geronimo-javamail_1.4_spec</artifactId> </exclusion> <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-stax-api_1.0_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-activation_1.1_spec</artifactId> + </exclusion> + <exclusion> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> </exclusion> diff --git a/archiva-modules/metadata/metadata-model/pom.xml b/archiva-modules/metadata/metadata-model/pom.xml index 5c7aed57f..8f5d9cf48 100644 --- a/archiva-modules/metadata/metadata-model/pom.xml +++ b/archiva-modules/metadata/metadata-model/pom.xml @@ -28,13 +28,6 @@ <packaging>bundle</packaging> <name>Archiva Metadata :: Model</name> - <dependencies> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - </dependencies> - <build> <plugins> <plugin> |