Author: norman
Date: Tue Jun 8 14:04:02 2010
New Revision: 952652
URL: http://svn.apache.org/viewvc?rev=952652&view=rev
Log:
Adjust dependencies and methods to be able to build and run on java5
Modified:
james/server/trunk/core-api/pom.xml
james/server/trunk/core-function/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/jpa-store/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/netty-socket/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/remotemanager/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/user-function/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/core-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Tue Jun 8 14:04:02 2010
@@ -46,5 +46,9 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/core-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Tue Jun 8 14:04:02 2010
@@ -75,7 +75,10 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -108,10 +111,5 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Tue Jun 8 14:04:02 2010
@@ -66,6 +66,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<classifier>tests</classifier>
Modified: james/server/trunk/fetchmail/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Tue Jun 8 14:04:02 2010
@@ -60,5 +60,9 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/jpa-store/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jpa-store/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/jpa-store/pom.xml (original)
+++ james/server/trunk/jpa-store/pom.xml Tue Jun 8 14:04:02 2010
@@ -63,6 +63,14 @@
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ </dependencies>
</plugin>
</plugins>
</build>
Modified: james/server/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Tue Jun 8 14:04:02 2010
@@ -82,7 +82,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-standard-mailets</artifactId>
Modified: james/server/trunk/netty-socket/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/netty-socket/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/netty-socket/pom.xml (original)
+++ james/server/trunk/netty-socket/pom.xml Tue Jun 8 14:04:02 2010
@@ -55,5 +55,9 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Jun 8 14:04:02 2010
@@ -731,7 +731,7 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>1.3</version>
<exclusions>
<exclusion>
<artifactId>xercesImpl</artifactId>
@@ -1072,6 +1072,11 @@
<version>3.1.5.GA</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Tue Jun 8 14:04:02 2010
@@ -89,7 +89,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-store</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
Modified: james/server/trunk/remotemanager/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Tue Jun 8 14:04:02 2010
@@ -56,10 +56,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -82,6 +78,10 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
<type>test-jar</type>
Modified: james/server/trunk/smtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Tue Jun 8 14:04:02 2010
@@ -101,7 +101,10 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
<dependency>
<artifactId>dnsjava</artifactId>
<groupId>dnsjava</groupId>
Modified:
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
---
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
(original)
+++
james/server/trunk/spoolmanager/src/main/java/org/apache/james/MailboxManagerPoster.java
Tue Jun 8 14:04:02 2010
@@ -181,7 +181,7 @@ public class MailboxManagerPoster implem
headersInputStream = new
ByteArrayInputStream(headersOut.toByteArray());
this.bodyInputStream = message.getInputStream();
} catch (MessagingException e) {
- throw new IOException("Unable to read MimeMessage", e);
+ throw new IOException("Unable to read MimeMessage: " +
e.getMessage());
}
}
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Tue Jun 8 14:04:02 2010
@@ -337,7 +337,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
@@ -434,6 +437,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
@@ -487,10 +491,12 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
@@ -523,48 +529,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
- <type>test-jar</type>
- <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>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-smtpserver</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
Modified: james/server/trunk/user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-function/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/user-function/pom.xml (original)
+++ james/server/trunk/user-function/pom.xml Tue Jun 8 14:04:02 2010
@@ -69,7 +69,11 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
Modified: james/server/trunk/user-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=952652&r1=952651&r2=952652&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Tue Jun 8 14:04:02 2010
@@ -68,6 +68,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
