Author: olamy
Date: Tue Aug 7 18:12:39 2012
New Revision: 1370410
URL: http://svn.apache.org/viewvc?rev=1370410&view=rev
Log:
no more need of jaxb-api we are now 1.6 required
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml?rev=1370410&r1=1370409&r2=1370410&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
Tue Aug 7 18:12:39 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml?rev=1370410&r1=1370409&r2=1370410&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
Tue Aug 7 18:12:39 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml?rev=1370410&r1=1370409&r2=1370410&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
Tue Aug 7 18:12:39 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1370410&r1=1370409&r2=1370410&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Tue Aug
7 18:12:39 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml?rev=1370410&r1=1370409&r2=1370410&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml (original)
+++ archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml Tue Aug 7
18:12:39 2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1370410&r1=1370409&r2=1370410&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Aug 7 18:12:39 2012
@@ -465,12 +465,6 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.1</version>
- </dependency>
-
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.1.1</version>
@@ -1492,7 +1486,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<goals>
