Cleanup of dependencies

archiva-modules/archiva-base/archiva-repository-layer/pom.xml

@@ -61,10 +61,6 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-xml-tools</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.archiva.maven</groupId>
-      <artifactId>archiva-maven-metadata</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-filelock</artifactId>

archiva-modules/archiva-base/archiva-repository-scanner/pom.xml

@@ -49,8 +49,17 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>metadata-model</artifactId>
+    </dependency>
 
     <!-- Test scope -->
+    <dependency>
+      <groupId>org.apache.archiva.maven</groupId>
+      <artifactId>archiva-maven-metadata</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>

pom.xml

@@ -53,7 +53,6 @@
     <!-- Java Enterprise APIs -->
     <javax.servlet.version>4.0.1</javax.servlet.version>
     <javax.activation.version>1.1.1</javax.activation.version>
-    <javax.jaxb.version>2.3.1</javax.jaxb.version>
 
 
     <commons-codec.version>1.13</commons-codec.version>
@@ -75,7 +74,7 @@
     <!-- dependencies of maven modules -->
     <jsoup.version>1.12.1</jsoup.version>
     <rome.version>1.12.2</rome.version>
-    <cronutils.version>9.0.1</cronutils.version>
+    <cronutils.version>9.0.2</cronutils.version>
 
     <lucene.version>4.10.4</lucene.version>
 
@@ -786,7 +785,7 @@
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>${commons-beanutils.version}</version>
+        <version>${commons.beanutils.version}</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>

status-dep.txt

@@ -12,6 +12,9 @@ archiva-modules
   archiva-checksum
   archiva-policies
   archiva-configuration
+  archiva-repository-api
+  archiva-xml-tools
+  archiva-repository-layer