You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/23 12:17:05 UTC

svn commit: r1138811 - in /james/server/trunk: ./ container-spring/ data-library/ dnsservice-dnsjava/ fetchmail/ file/ imapserver/ jcr/ jdbc/ jpa/ ldap/ lmtpserver/ mailbox-adapter/ mailetcontainer-camel/ mailetcontainer-library/ mailets/ osgi/ pop3ser...

Author: norman
Date: Thu Jun 23 10:17:04 2011
New Revision: 1138811

URL: http://svn.apache.org/viewvc?rev=1138811&view=rev
Log:
no need for annotation jar as we depend on jdk6. See JAMES-1280

Modified:
    james/server/trunk/container-spring/pom.xml
    james/server/trunk/data-library/pom.xml
    james/server/trunk/dnsservice-dnsjava/pom.xml
    james/server/trunk/fetchmail/pom.xml
    james/server/trunk/file/pom.xml
    james/server/trunk/imapserver/pom.xml
    james/server/trunk/jcr/pom.xml
    james/server/trunk/jdbc/pom.xml
    james/server/trunk/jpa/pom.xml
    james/server/trunk/ldap/pom.xml
    james/server/trunk/lmtpserver/pom.xml
    james/server/trunk/mailbox-adapter/pom.xml
    james/server/trunk/mailetcontainer-camel/pom.xml
    james/server/trunk/mailetcontainer-library/pom.xml
    james/server/trunk/mailets/pom.xml
    james/server/trunk/osgi/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/pop3server/pom.xml
    james/server/trunk/protocols-library/pom.xml
    james/server/trunk/queue-activemq/pom.xml
    james/server/trunk/queue-jms/pom.xml
    james/server/trunk/smtpserver/pom.xml

Modified: james/server/trunk/container-spring/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Thu Jun 23 10:17:04 2011
@@ -516,10 +516,6 @@ END Tanuki Software License ============
       <artifactId>spring-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
-    <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
     </dependency>

Modified: james/server/trunk/data-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Thu Jun 23 10:17:04 2011
@@ -58,10 +58,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <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>
     </dependency>   

Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Thu Jun 23 10:17:04 2011
@@ -84,10 +84,6 @@ Parent pom build failure prevents inheri
       <artifactId>dnsjava</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: james/server/trunk/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Thu Jun 23 10:17:04 2011
@@ -68,10 +68,6 @@
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
   </dependencies>
 
   <build>

Modified: james/server/trunk/file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Thu Jun 23 10:17:04 2011
@@ -62,10 +62,6 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <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>
     </dependency>

Modified: james/server/trunk/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Thu Jun 23 10:17:04 2011
@@ -61,10 +61,6 @@
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
   </dependencies>
 
   <build>

Modified: james/server/trunk/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jcr/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/jcr/pom.xml (original)
+++ james/server/trunk/jcr/pom.xml Thu Jun 23 10:17:04 2011
@@ -40,11 +40,7 @@
      <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency>    
+    </dependency>  
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>james-server-core</artifactId>

Modified: james/server/trunk/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/jdbc/pom.xml (original)
+++ james/server/trunk/jdbc/pom.xml Thu Jun 23 10:17:04 2011
@@ -70,10 +70,6 @@
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
    
     <!-- Test dependencies -->
     <dependency>

Modified: james/server/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/jpa/pom.xml (original)
+++ james/server/trunk/jpa/pom.xml Thu Jun 23 10:17:04 2011
@@ -114,10 +114,6 @@ Parent pom build failure prevents inheri
     </dependency>
     <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>
     </dependency>       
 

Modified: james/server/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/ldap/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/ldap/pom.xml (original)
+++ james/server/trunk/ldap/pom.xml Thu Jun 23 10:17:04 2011
@@ -45,10 +45,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
 
   </dependencies>
 

Modified: james/server/trunk/lmtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Thu Jun 23 10:17:04 2011
@@ -103,10 +103,6 @@
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
   </dependencies>
 
   <build>

Modified: james/server/trunk/mailbox-adapter/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/mailbox-adapter/pom.xml Thu Jun 23 10:17:04 2011
@@ -57,10 +57,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
   </dependencies>
 
   <build>

Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Thu Jun 23 10:17:04 2011
@@ -74,10 +74,6 @@
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
-    <dependency>
-       <groupId>org.apache.geronimo.specs</groupId>
-       <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency>
    <dependency>
      <groupId>org.apache.camel</groupId>
      <artifactId>camel-core</artifactId>

Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Thu Jun 23 10:17:04 2011
@@ -80,10 +80,6 @@ Parent pom build failure prevents inheri
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
-    <dependency>
-       <groupId>org.apache.geronimo.specs</groupId>
-       <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency>
     
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Thu Jun 23 10:17:04 2011
@@ -162,10 +162,6 @@ Parent pom build failure prevents inheri
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
-    <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailbox-api</artifactId>
     </dependency>   

Modified: james/server/trunk/osgi/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/osgi/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/osgi/pom.xml (original)
+++ james/server/trunk/osgi/pom.xml Thu Jun 23 10:17:04 2011
@@ -84,10 +84,6 @@
       <artifactId>org.osgi.core</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-container-spring</artifactId>
     </dependency> 

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Jun 23 10:17:04 2011
@@ -559,11 +559,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-      <version>1.1.1</version>
-    </dependency> 
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
       <version>1.0</version>
     </dependency> 

Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Thu Jun 23 10:17:04 2011
@@ -61,10 +61,6 @@
       <artifactId>netty</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-filesystem-api</artifactId>
     </dependency>

Modified: james/server/trunk/protocols-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-library/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols-library/pom.xml Thu Jun 23 10:17:04 2011
@@ -105,10 +105,6 @@ Parent pom build failure prevents inheri
       <artifactId>commons-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
-    <dependency>
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>

Modified: james/server/trunk/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Thu Jun 23 10:17:04 2011
@@ -77,10 +77,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
     <dependency>

Modified: james/server/trunk/queue-jms/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/queue-jms/pom.xml (original)
+++ james/server/trunk/queue-jms/pom.xml Thu Jun 23 10:17:04 2011
@@ -57,11 +57,7 @@
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
-    <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=1138811&r1=1138810&r2=1138811&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Thu Jun 23 10:17:04 2011
@@ -106,10 +106,6 @@
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-    </dependency> 
 
     <!-- Test dependencies -->
     <dependency>



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