Use our james-wrapper bundle to avoid relying on James snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1620592 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/mail-archive/README.md b/mail-archive/README.md
index 9d716c7..fdef9cb 100644
--- a/mail-archive/README.md
+++ b/mail-archive/README.md
@@ -6,10 +6,8 @@
and meant to create a useful mail archive server that also serves
as a more complex Sling sample.
-To run this, install the dom, core and mbox bundles from the
-http://james.apache.org/mime4j/ project on a trunk Sling launchpad
-instance, and install the bundles provided by this module. Note the
-MIME4J-231 issue when building the Mime4J bundles.
+To run this, and install the bundles provided by this module in a
+Sling Launchpad (trunk) instance.
Then, start at http://localhost:8080/mailarchiveserver/import.mbox.html
to import a few mbox files, you can find some at
diff --git a/mail-archive/pom.xml b/mail-archive/pom.xml
index ec6d263..f27da5c 100644
--- a/mail-archive/pom.xml
+++ b/mail-archive/pom.xml
@@ -30,5 +30,6 @@
<module>server</module>
<module>ui</module>
<module>stats</module>
+ <module>james-wrapper</module>
</modules>
</project>
diff --git a/mail-archive/server/pom.xml b/mail-archive/server/pom.xml
index cba848b..8c0d014 100644
--- a/mail-archive/server/pom.xml
+++ b/mail-archive/server/pom.xml
@@ -103,27 +103,21 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-mbox-iterator</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.mailarchive.james.wrapper</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.7.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-storage</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.7.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/mail-archive/stats/pom.xml b/mail-archive/stats/pom.xml
index c60ef7f..b9e74c3 100644
--- a/mail-archive/stats/pom.xml
+++ b/mail-archive/stats/pom.xml
@@ -130,19 +130,19 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-mbox-iterator</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.7.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
- <version>0.8.0-SNAPSHOT</version>
+ <version>0.7.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.mailarchive.james.wrapper</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
