From commits-return-26189-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Jun 04 20:58:29 2010
Return-Path: <commits-return-26189-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 50395 invoked from network); 4 Jun 2010 20:58:28 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 4 Jun 2010 20:58:28 -0000
Received: (qmail 82609 invoked by uid 500); 4 Jun 2010 20:58:28 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 82547 invoked by uid 500); 4 Jun 2010 20:58:28 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 82540 invoked by uid 99); 4 Jun 2010 20:58:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 20:58:28 +0000
X-ASF-Spam-Status: No, hits=-1515.0 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jun 2010 20:58:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0BC9623889E1; Fri,  4 Jun 2010 20:58:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r951565 - in /directory: apacheds/trunk/pom.xml
 clients/ldap/trunk/pom.xml installers/trunk/pom.xml
 shared/trunk/dsml-parser/pom.xml shared/trunk/ldap/pom.xml
 shared/trunk/pom.xml
Date: Fri, 04 Jun 2010 20:58:07 -0000
To: commits@directory.apache.org
From: seelmann@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100604205808.0BC9623889E1@eris.apache.org>

Author: seelmann
Date: Fri Jun  4 20:58:07 2010
New Revision: 951565

URL: http://svn.apache.org/viewvc?rev=951565&view=rev
Log:
Fixed build on Java5. If a dependency uses findbugs annotations the dependee also needs to know the findbugs annotations at compile time.

Modified:
    directory/apacheds/trunk/pom.xml
    directory/clients/ldap/trunk/pom.xml
    directory/installers/trunk/pom.xml
    directory/shared/trunk/dsml-parser/pom.xml
    directory/shared/trunk/ldap/pom.xml
    directory/shared/trunk/pom.xml

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=951565&r1=951564&r2=951565&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Fri Jun  4 20:58:07 2010
@@ -79,6 +79,7 @@
     <wrapper.version>3.2.3</wrapper.version>
     <xbean.spring.version>3.6</xbean.spring.version>
     <xercesImpl.version>2.9.1</xercesImpl.version>
+    <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
   </properties>
 
   <url>http://directory.apache.org/apacheds/1.5</url>
@@ -723,10 +724,23 @@
         <artifactId>jetty-util</artifactId>
         <version>${jetty.version}</version>
       </dependency>
+
+      <dependency>
+        <groupId>findbugs</groupId>
+        <artifactId>annotations</artifactId>
+        <version>${findbugs.annotations.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <dependencies>
+    <!-- for Java5 findbugs annotations are required in each module at compile time -->
+    <dependency>
+      <groupId>findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- common logging interface -->
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: directory/clients/ldap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/pom.xml?rev=951565&r1=951564&r2=951565&view=diff
==============================================================================
--- directory/clients/ldap/trunk/pom.xml (original)
+++ directory/clients/ldap/trunk/pom.xml Fri Jun  4 20:58:07 2010
@@ -51,6 +51,7 @@
     <mina.core.version>2.0.0-RC1</mina.core.version>
     <slf4j.log4j12.version>1.5.11</slf4j.log4j12.version>
     <log4j.version>1.2.16</log4j.version>
+    <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
   </properties>
 
   <url>http://directory.apache.org/apacheds/1.5</url>
@@ -144,9 +145,24 @@
         <artifactId>log4j</artifactId>
         <version>${log4j.version}</version>
       </dependency>
+
+      <dependency>
+        <groupId>findbugs</groupId>
+        <artifactId>annotations</artifactId>
+        <version>${findbugs.annotations.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
+  <dependencies>
+    <!-- for Java5 findbugs annotations are required in each module at compile time -->
+    <dependency>
+      <groupId>findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
   <modules>
     <module>ldap-client-api</module>
   </modules>

Modified: directory/installers/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/installers/trunk/pom.xml?rev=951565&r1=951564&r2=951565&view=diff
==============================================================================
--- directory/installers/trunk/pom.xml (original)
+++ directory/installers/trunk/pom.xml Fri Jun  4 20:58:07 2010
@@ -81,6 +81,7 @@
     <wrapper.version>3.2.3</wrapper.version>
     <xbean.spring.version>3.5</xbean.spring.version>
     <xercesImpl.version>2.9.1</xercesImpl.version>
+    <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
   </properties>
 
   <url>http://directory.apache.org/apacheds/1.5</url>
@@ -434,6 +435,12 @@
         <version>${wrapper.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>findbugs</groupId>
+        <artifactId>annotations</artifactId>
+        <version>${findbugs.annotations.version}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -542,6 +549,13 @@
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
+
+    <!-- for Java5 findbugs annotations are required in each module at compile time -->
+    <dependency>
+      <groupId>findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   
   <modules>

Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=951565&r1=951564&r2=951565&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Fri Jun  4 20:58:07 2010
@@ -55,12 +55,6 @@
     </dependency>
 
     <dependency>
-      <groupId>findbugs</groupId>
-      <artifactId>annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
     </dependency>

Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=951565&r1=951564&r2=951565&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Fri Jun  4 20:58:07 2010
@@ -60,12 +60,6 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>findbugs</groupId>
-      <artifactId>annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
   <build>

Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=951565&r1=951564&r2=951565&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Fri Jun  4 20:58:07 2010
@@ -278,6 +278,13 @@
   </dependencyManagement>
 
   <dependencies>
+    <!-- for Java5 findbugs annotations are required in each module at compile time -->
+    <dependency>
+      <groupId>findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <!-- common logging interface -->
     <dependency>
       <groupId>org.slf4j</groupId>