james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nor...@apache.org
Subject svn commit: r1051282 - in /james/server/trunk: ./ container-spring/ core/ dnsservice-dnsjava/ domainlist-jpa/ domainlist-library/ fetchmail/ imapserver/ lmtpserver/ mail-file/ mail-jcr/ mail-jdbc/ mail-library/ mailbox-adapter/ mailets/ nio-netty/ osgi...
Date Mon, 20 Dec 2010 20:42:26 GMT
Author: norman
Date: Mon Dec 20 20:42:25 2010
New Revision: 1051282

URL: http://svn.apache.org/viewvc?rev=1051282&view=rev
Log:
Use geronimo-annotation_1.0_spec for javax.annotation anywhere (JAMES-1151) 

Modified:
    james/server/trunk/container-spring/pom.xml
    james/server/trunk/core/pom.xml
    james/server/trunk/dnsservice-dnsjava/pom.xml
    james/server/trunk/domainlist-jpa/pom.xml
    james/server/trunk/domainlist-library/pom.xml
    james/server/trunk/fetchmail/pom.xml
    james/server/trunk/imapserver/pom.xml
    james/server/trunk/lmtpserver/pom.xml
    james/server/trunk/mail-file/pom.xml
    james/server/trunk/mail-jcr/pom.xml
    james/server/trunk/mail-jdbc/pom.xml
    james/server/trunk/mail-library/pom.xml
    james/server/trunk/mailbox-adapter/pom.xml
    james/server/trunk/mailets/pom.xml
    james/server/trunk/nio-netty/pom.xml
    james/server/trunk/osgi/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/user-file/pom.xml
    james/server/trunk/user-jcr/pom.xml
    james/server/trunk/user-jdbc/pom.xml
    james/server/trunk/user-jpa/pom.xml
    james/server/trunk/user-ldap/pom.xml
    james/server/trunk/user-library/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Mon Dec 20 20:42:25 2010
@@ -426,9 +426,9 @@
       <artifactId>spring-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>

Modified: james/server/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/core/pom.xml (original)
+++ james/server/trunk/core/pom.xml Mon Dec 20 20:42:25 2010
@@ -67,12 +67,6 @@
       <artifactId>${javax.activation.artifactId}</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
-    
-    
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Mon Dec 20 20:42:25 2010
@@ -87,9 +87,9 @@
       <artifactId>dnsjava</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: james/server/trunk/domainlist-jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/domainlist-jpa/pom.xml (original)
+++ james/server/trunk/domainlist-jpa/pom.xml Mon Dec 20 20:42:25 2010
@@ -50,9 +50,9 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>    
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>

Modified: james/server/trunk/domainlist-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domainlist-library/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/domainlist-library/pom.xml (original)
+++ james/server/trunk/domainlist-library/pom.xml Mon Dec 20 20:42:25 2010
@@ -76,9 +76,9 @@
       <artifactId>james-server-lifecycle-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>

Modified: james/server/trunk/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Mon Dec 20 20:42:25 2010
@@ -73,8 +73,8 @@
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
   </dependencies>
 </project>

Modified: james/server/trunk/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Mon Dec 20 20:42:25 2010
@@ -57,8 +57,8 @@
       <artifactId>netty</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
   </dependencies>
 </project>

Modified: james/server/trunk/lmtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Mon Dec 20 20:42:25 2010
@@ -85,9 +85,8 @@
       <artifactId>netty</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
-
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
   </dependencies>
 </project>

Modified: james/server/trunk/mail-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-file/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/mail-file/pom.xml (original)
+++ james/server/trunk/mail-file/pom.xml Mon Dec 20 20:42:25 2010
@@ -73,9 +73,9 @@
       <artifactId>oro</artifactId>
     </dependency>    
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     
     <dependency>
       <groupId>junit</groupId>

Modified: james/server/trunk/mail-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jcr/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/mail-jcr/pom.xml (original)
+++ james/server/trunk/mail-jcr/pom.xml Mon Dec 20 20:42:25 2010
@@ -61,9 +61,9 @@
       <artifactId>mail</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>

Modified: james/server/trunk/mail-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/pom.xml (original)
+++ james/server/trunk/mail-jdbc/pom.xml Mon Dec 20 20:42:25 2010
@@ -70,9 +70,9 @@
     </dependency>
     
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

Modified: james/server/trunk/mail-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-library/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/mail-library/pom.xml (original)
+++ james/server/trunk/mail-library/pom.xml Mon Dec 20 20:42:25 2010
@@ -74,11 +74,10 @@
       <groupId>org.apache.james</groupId>
       <artifactId>apache-mailet</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
 
   </dependencies>
 </project>

Modified: james/server/trunk/mailbox-adapter/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/mailbox-adapter/pom.xml Mon Dec 20 20:42:25 2010
@@ -58,8 +58,8 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
     </dependency> 
   </dependencies>
 </project>

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Mon Dec 20 20:42:25 2010
@@ -182,9 +182,9 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>

Modified: james/server/trunk/nio-netty/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/nio-netty/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/nio-netty/pom.xml (original)
+++ james/server/trunk/nio-netty/pom.xml Mon Dec 20 20:42:25 2010
@@ -103,9 +103,9 @@
       <artifactId>commons-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>

Modified: james/server/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/osgi/pom.xml (original)
+++ james/server/trunk/osgi/pom.xml Mon Dec 20 20:42:25 2010
@@ -84,9 +84,9 @@
       <artifactId>org.osgi.core</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-container-spring</artifactId>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Dec 20 20:42:25 2010
@@ -372,7 +372,7 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-annotation_1.0_spec</artifactId>
-      <version>1.1</version>
+      <version>1.1.1</version>
     </dependency> 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -1179,11 +1179,6 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
       <version>2.1</version>

Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Mon Dec 20 20:42:25 2010
@@ -73,9 +73,9 @@
       <artifactId>netty</artifactId>
     </dependency>  
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/remotemanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Mon Dec 20 20:42:25 2010
@@ -77,9 +77,9 @@
       <artifactId>netty</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>

Modified: james/server/trunk/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Mon Dec 20 20:42:25 2010
@@ -102,9 +102,9 @@
       <artifactId>netty</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
 
     <!-- Test dependencies -->   
     <dependency>

Modified: james/server/trunk/user-file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-file/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/user-file/pom.xml (original)
+++ james/server/trunk/user-file/pom.xml Mon Dec 20 20:42:25 2010
@@ -71,9 +71,9 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
 
     <!-- Test dependencies -->
     <dependency>

Modified: james/server/trunk/user-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jcr/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/user-jcr/pom.xml (original)
+++ james/server/trunk/user-jcr/pom.xml Mon Dec 20 20:42:25 2010
@@ -46,9 +46,9 @@
       <artifactId>commons-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>   
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency>    
     <dependency>
       <groupId>javax.jcr</groupId>
       <artifactId>jcr</artifactId>

Modified: james/server/trunk/user-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/pom.xml (original)
+++ james/server/trunk/user-jdbc/pom.xml Mon Dec 20 20:42:25 2010
@@ -67,9 +67,9 @@
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
    
     <!-- Test dependencies -->
     <dependency>

Modified: james/server/trunk/user-jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-jpa/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/user-jpa/pom.xml (original)
+++ james/server/trunk/user-jpa/pom.xml Mon Dec 20 20:42:25 2010
@@ -89,9 +89,9 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jpa_2.0_spec</artifactId>

Modified: james/server/trunk/user-ldap/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-ldap/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/user-ldap/pom.xml (original)
+++ james/server/trunk/user-ldap/pom.xml Mon Dec 20 20:42:25 2010
@@ -45,11 +45,10 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
-
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
 
   </dependencies>
 </project>

Modified: james/server/trunk/user-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=1051282&r1=1051281&r2=1051282&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Mon Dec 20 20:42:25 2010
@@ -54,9 +54,9 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>jsr250-api</artifactId>
-    </dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+    </dependency> 
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message