Author: rdonkin
Date: Sun Feb 22 17:28:15 2009
New Revision: 746780
URL: http://svn.apache.org/viewvc?rev=746780&view=rev
Log:
Fix mvn package JAMES-888 https://issues.apache.org/jira/browse/JAMES-888
Added:
james/server/trunk/stage/com.h2database/jars/h2-1.1.102.jar
- copied unchanged from r746648,
james/server/trunk/stage/com.h2database/jars/h2.jar
Removed:
james/server/trunk/stage/com.h2database/jars/h2.jar
Modified:
james/server/trunk/avalon-spring-bridge-library/pom.xml
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/basic-user-function/pom.xml
james/server/trunk/imapserver-function/pom.xml
james/server/trunk/include.properties
james/server/trunk/jcr-store/pom.xml
james/server/trunk/mailets-function/pom.xml
james/server/trunk/management-library/pom.xml
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/pom.xml
james/server/trunk/spoolmanager-function/pom.xml
james/server/trunk/stage/pom.xml
Modified: james/server/trunk/avalon-spring-bridge-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/pom.xml (original)
+++ james/server/trunk/avalon-spring-bridge-library/pom.xml Sun Feb 22 17:28:15
2009
@@ -59,6 +59,16 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
@@ -66,4 +76,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: james/server/trunk/avalon-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Sun Feb 22 17:28:15 2009
@@ -55,6 +55,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/basic-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/pom.xml (original)
+++ james/server/trunk/basic-user-function/pom.xml Sun Feb 22 17:28:15 2009
@@ -39,6 +39,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -75,4 +76,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: james/server/trunk/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Sun Feb 22 17:28:15 2009
@@ -54,6 +54,20 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-mailet</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -111,4 +125,4 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: james/server/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sun Feb 22 17:28:15 2009
@@ -329,7 +329,7 @@
jackrabbit-core.jar=${path.lib.jackrabbit}/jackrabbit-core-1.4.6.jar
jackrabbit-spi-commons.jar=${path.lib.jackrabbit}/jackrabbit-spi-commons-1.4.jar
# Memory only database
-h2.jar=${path.lib.h2}/h2.jar
+h2.jar=${path.lib.h2}/h2-1.1.102
lucene.jar=${path.lib.lucene}/lucene-core-2.2.0.jar
slf4j-api.jar=${path.lib.slf4j}/slf4j-api-1.3.0.jar
slf4j-log4j.jar=${path.lib.slf4j}/slf4j-log4j12-1.3.0.jar
Modified: james/server/trunk/jcr-store/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-store/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/jcr-store/pom.xml (original)
+++ james/server/trunk/jcr-store/pom.xml Sun Feb 22 17:28:15 2009
@@ -42,6 +42,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
<dependency>
@@ -54,6 +58,10 @@
<version>1.0</version>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<version>1.4.1</version>
@@ -76,11 +84,31 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
+ <groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.1.102</version>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: james/server/trunk/mailets-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Sun Feb 22 17:28:15 2009
@@ -64,6 +64,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/management-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/management-library/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/management-library/pom.xml (original)
+++ james/server/trunk/management-library/pom.xml Sun Feb 22 17:28:15 2009
@@ -43,6 +43,11 @@
-->
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
</dependency>
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Sun Feb 22 17:28:15 2009
@@ -51,8 +51,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<optimize>true</optimize>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
</plugins>
@@ -221,6 +221,12 @@
<artifactId>jackrabbit-api</artifactId>
<version>1.3</version>
</dependency>
+
+ <dependency>
+ <groupId>avalon-phoenix</groupId>
+ <artifactId>avalon-phoenix-client</artifactId>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Feb 22 17:28:15 2009
@@ -243,6 +243,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>1.0RC3</version>
@@ -321,6 +326,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-avalon-spring-bridge-library</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
@@ -452,6 +463,13 @@
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.102</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-phoenix-deployment</artifactId>
<version>3.0-SNAPSHOT</version>
@@ -497,7 +515,12 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
- <version>0.2</version>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-mailet</artifactId>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -978,6 +1001,12 @@
<artifactId>spring</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: james/server/trunk/spoolmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/pom.xml (original)
+++ james/server/trunk/spoolmanager-function/pom.xml Sun Feb 22 17:28:15 2009
@@ -38,6 +38,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-javamail-util</artifactId>
</dependency>
<dependency>
@@ -52,18 +57,19 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
<dependency>
@@ -108,14 +114,14 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
- <type>test-jar</type>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/server/trunk/stage/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=746780&r1=746779&r2=746780&view=diff
==============================================================================
--- james/server/trunk/stage/pom.xml (original)
+++ james/server/trunk/stage/pom.xml Sun Feb 22 17:28:15 2009
@@ -74,10 +74,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mailbox-library</artifactId>
- </dependency>
-->
<dependency>
<groupId>org.apache.james</groupId>
@@ -203,6 +199,12 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-mailet</artifactId>
+ <version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -232,6 +234,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </dependency>
<!-- used by torque -->
<dependency>
<groupId>commons-pool</groupId>
@@ -436,6 +442,19 @@
<artifactId>apache-standard-mailets</artifactId>
<classifier>tests</classifier>
</dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.102</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
