Author: bago
Date: Sun Jun 29 11:35:25 2008
New Revision: 672656

URL: http://svn.apache.org/viewvc?rev=672656&view=rev
Log:
Moved local repository "hack" to the stage module (JAMES-840)
Patch submitted by David Jencks. Thanks.

Modified:
    james/server/trunk/pom.xml
    james/server/trunk/spring-deployment/pom.xml

Modified: james/server/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=672656&r1=672655&r2=672656&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Jun 29 11:35:25 2008
@@ -34,6 +34,7 @@
   <inceptionYear>2002</inceptionYear>
   <packaging>pom</packaging>
   <modules>
+    <module>stage</module>
     <module>user-api</module>
     <module>domain-api</module>
     <module>imap-api</module>
@@ -109,6 +110,7 @@
     </plugins>
   </build>
   <repositories>
+<!--
     <repository>
       <id>local-james-stage-m1</id>
       <name>Local James stage repository</name>
@@ -123,7 +125,7 @@
         <checksumPolicy>ignore</checksumPolicy>
       </snapshots>
     </repository>
-    <!-- this is an hack for submodules to find stage folder -->
+    <! - - this is an hack for submodules to find stage folder - ->
     <repository>
       <id>parent-james-stage-m1</id>
       <name>Parent James stage repository</name>
@@ -138,7 +140,7 @@
         <checksumPolicy>ignore</checksumPolicy>
       </snapshots>
     </repository>
-    
+-->    
     <!-- Override parent POM to remove repositories -->
     <!-- 
     <repository>
@@ -371,6 +373,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-phoenix-deployment</artifactId>
+      <version>3.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk14</artifactId>
       <version>129</version>
@@ -850,18 +858,39 @@
       <groupId>org.apache.james</groupId>
       <artifactId>apache-mime4j</artifactId>
       <version>0.4-SNAPSHOT</version>
-    </dependency>
-    <!-- Used by Mime4J -->
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.2</version>
+    </dependency>
+    <!-- Used by Mime4J -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>4.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon-phoenix</groupId>
+      <artifactId>avalon-phoenix-client</artifactId>
+      <version>4.2-SNAPSHOT</version>
+    </dependency>
+    <!-- phoenix runtime -->
+    <dependency>
+      <groupId>spice</groupId>
+      <artifactId>spice-configkit</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+    </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>

Modified: james/server/trunk/spring-deployment/pom.xml
URL: 
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=672656&r1=672655&r2=672656&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Sun Jun 29 11:35:25 2008
@@ -72,12 +72,10 @@
     <dependency>
       <groupId>avalon-phoenix</groupId>
       <artifactId>avalon-phoenix-client</artifactId>
-      <version>4.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to