From a2bc87deb7cefaa544e17637e71cf9cb1a3da6b8 Mon Sep 17 00:00:00 2001
From: Emmanuel Venisse <evenisse@apache.org>
Date: Wed, 7 Feb 2007 12:56:20 +0000
Subject: [PATCH] o Add deby in dependencyManagement o define the scope of
 activation/mail jars to provided

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@504532 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-plexus-runtime/pom.xml |  1 -
 archiva-webapp/pom.xml         | 13 ++++++++++++-
 pom.xml                        |  5 +++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/archiva-plexus-runtime/pom.xml b/archiva-plexus-runtime/pom.xml
index 65ad65ea3..63cd7f540 100644
--- a/archiva-plexus-runtime/pom.xml
+++ b/archiva-plexus-runtime/pom.xml
@@ -71,7 +71,6 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index d6271ecbb..81da928d4 100644
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -168,7 +168,18 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 00e8399e1..2bd13d602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -395,6 +395,11 @@
         <artifactId>commons-io</artifactId>
         <version>1.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>10.1.3.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <reporting>
-- 
2.39.5