Author: norman
Date: Mon Jul 4 17:33:34 2011
New Revision: 1142746
URL: http://svn.apache.org/viewvc?rev=1142746&view=rev
Log:
Use annotation dependency as it is needed for the bundle plugin to generate the
correct import. See JAMES-835
Modified:
james/server/trunk/dnsservice-dnsjava/pom.xml
james/server/trunk/fetchmail/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/lifecycle-spring/pom.xml
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/mailetcontainer-camel/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/dnsservice-dnsjava/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Mon Jul 4 17:33:34 2011
@@ -84,6 +84,11 @@ Parent pom build failure prevents inheri
<artifactId>dnsjava</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_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=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Mon Jul 4 17:33:34 2011
@@ -77,6 +77,10 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: james/server/trunk/imapserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Mon Jul 4 17:33:34 2011
@@ -71,6 +71,10 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_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=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/jcr/pom.xml (original)
+++ james/server/trunk/jcr/pom.xml Mon Jul 4 17:33:34 2011
@@ -83,7 +83,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: james/server/trunk/jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jdbc/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/jdbc/pom.xml (original)
+++ james/server/trunk/jdbc/pom.xml Mon Jul 4 17:33:34 2011
@@ -80,7 +80,11 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
Modified: james/server/trunk/jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jpa/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/jpa/pom.xml (original)
+++ james/server/trunk/jpa/pom.xml Mon Jul 4 17:33:34 2011
@@ -151,7 +151,11 @@ Parent pom build failure prevents inheri
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
Modified: james/server/trunk/ldap/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/ldap/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/ldap/pom.xml (original)
+++ james/server/trunk/ldap/pom.xml Mon Jul 4 17:33:34 2011
@@ -53,7 +53,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: james/server/trunk/lifecycle-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lifecycle-spring/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/lifecycle-spring/pom.xml (original)
+++ james/server/trunk/lifecycle-spring/pom.xml Mon Jul 4 17:33:34 2011
@@ -121,5 +121,9 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_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=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Mon Jul 4 17:33:34 2011
@@ -113,6 +113,10 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_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=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Mon Jul 4 17:33:34 2011
@@ -97,7 +97,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
<!-- test dependency -->
<dependency>
<groupId>junit</groupId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Jul 4 17:33:34 2011
@@ -1299,6 +1299,12 @@
<version>3.2.4.Final</version>
<scope>compile</scope>
</dependency>
+ <!-- This needed to let the bundle plugin to generate the right import
statement -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
<!-- OSGI dependencies -->
<dependency>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Mon Jul 4 17:33:34 2011
@@ -77,6 +77,10 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/protocols-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/protocols-library/pom.xml (original)
+++ james/server/trunk/protocols-library/pom.xml Mon Jul 4 17:33:34 2011
@@ -108,6 +108,9 @@ Parent pom build failure prevents inheri
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: james/server/trunk/queue-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Mon Jul 4 17:33:34 2011
@@ -107,6 +107,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
<!-- testing -->
<dependency>
Modified: james/server/trunk/queue-jms/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/queue-jms/pom.xml (original)
+++ james/server/trunk/queue-jms/pom.xml Mon Jul 4 17:33:34 2011
@@ -65,7 +65,11 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_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=1142746&r1=1142745&r2=1142746&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Mon Jul 4 17:33:34 2011
@@ -115,7 +115,11 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<artifactId>dnsjava</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
