[infinispan-commits] Infinispan SVN: r1240 - in trunk: query and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-11-30 13:12:51 -0500 (Mon, 30 Nov 2009)
New Revision: 1240

Modified:
   trunk/core/pom.xml
   trunk/query/pom.xml
   trunk/src/main/resources/assemblies/bin.xml
Log:
Fixed broken build

Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml	2009-11-30 14:52:43 UTC (rev 1239)
+++ trunk/core/pom.xml	2009-11-30 18:12:51 UTC (rev 1240)
@@ -63,7 +63,6 @@
          <groupId>org.rhq.helpers</groupId>
          <artifactId>rhq-pluginAnnotations</artifactId>
          <version>${version.rhq.pluginAnnotations}</version>
-         <scope>provided</scope>
       </dependency>
 
       <dependency>

Modified: trunk/query/pom.xml
===================================================================
--- trunk/query/pom.xml	2009-11-30 14:52:43 UTC (rev 1239)
+++ trunk/query/pom.xml	2009-11-30 18:12:51 UTC (rev 1240)
@@ -24,12 +24,6 @@
          <groupId>org.hibernate</groupId>
          <artifactId>hibernate-search</artifactId>
          <version>3.1.0.GA</version>
-         <exclusions>
-            <exclusion>
-               <groupId>javax.transaction</groupId>
-               <artifactId>jta</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
 
       <dependency>

Modified: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml	2009-11-30 14:52:43 UTC (rev 1239)
+++ trunk/src/main/resources/assemblies/bin.xml	2009-11-30 18:12:51 UTC (rev 1240)
@@ -88,14 +88,17 @@
          </sources>
 
          <binaries>
-
             <outputDirectory>.</outputDirectory>
             <unpack>false</unpack>
             <outputFileNameMapping>
                ${module.artifactId}.${module.extension}
             </outputFileNameMapping>
+
             <dependencySets>
                <dependencySet>
+                  <excludes>
+                     <exclude>org.rhq.helpers:rhq-pluginAnnotations</exclude>
+                  </excludes>
                   <useTransitiveDependencies>false</useTransitiveDependencies>
                   <outputDirectory>./lib</outputDirectory>
                </dependencySet>
@@ -184,8 +187,9 @@
                <dependencySet>
                   <excludes>
                      <exclude>infinispan-core*</exclude>
-                     <exclude>log4j</exclude>
                      <exclude>net.jcip</exclude>
+                     <exclude>rhq-pluginAnnotations</exclude>
+                     <exclude>jta</exclude>
                   </excludes>
                   <useTransitiveDependencies>true</useTransitiveDependencies>
                   <useTransitiveFiltering>true</useTransitiveFiltering>