JBoss Logging dep exclusion and stick to a maven bundle plugin version

infinispan · Jul 27, 2011 · 6e8ce92 · 6e8ce92
1 parent 8be95d3
commit 6e8ce92
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 2 deletions.
diff --git a/cachestore/bdbje/pom.xml b/cachestore/bdbje/pom.xml
@@ -49,6 +49,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/cachestore/cassandra/pom.xml b/cachestore/cassandra/pom.xml
@@ -79,6 +79,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
 				<configuration>
 					<instructions>
 						<Export-Package>

diff --git a/cachestore/cloud/pom.xml b/cachestore/cloud/pom.xml
@@ -105,6 +105,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/cachestore/jdbc/pom.xml b/cachestore/jdbc/pom.xml
@@ -65,6 +65,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/cachestore/jdbm/pom.xml b/cachestore/jdbm/pom.xml
@@ -62,6 +62,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/cachestore/remote/pom.xml b/cachestore/remote/pom.xml
@@ -71,6 +71,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -122,6 +122,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/client/hotrod-client/pom.xml b/client/hotrod-client/pom.xml
@@ -98,6 +98,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/lucene-directory/pom.xml b/lucene-directory/pom.xml
@@ -96,6 +96,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -106,7 +106,7 @@
       <version.c3p0>0.9.1.2</version.c3p0>
       <version.cassandra>0.8.0</version.cassandra>
       <version.cassandra.pool>0.8.1</version.cassandra.pool>
-      <version.cdi>1.0-SP4</version.cdi> 
+      <version.cdi>1.0-SP4</version.cdi>
       <version.com.intellij.forms_rt>6.0.5</version.com.intellij.forms_rt>
       <version.commons.compress>1.0</version.commons.compress>
       <version.commons.pool>1.5.4</version.commons.pool>
@@ -162,6 +162,9 @@
       <version.xsom>20081112</version.xsom>
       <version.xstream>1.3.1</version.xstream>
       <version.javassist>3.12.1.GA</version.javassist>
+
+      <!-- Maven dependencies -->
+      <version.maven.bundle>2.3.5</version.maven.bundle>
    </properties>
 
    <dependencies>
@@ -208,6 +211,18 @@
                <groupId>org.jboss.logging</groupId>
                <artifactId>jboss-logging-spi</artifactId>
             </exclusion>
+            <exclusion>
+               <groupId>org.jboss.logging</groupId>
+               <artifactId>jboss-logging</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>org.jboss.logging</groupId>
+               <artifactId>jboss-logging-processor</artifactId>
+            </exclusion>
+            <exclusion>
+               <groupId>org.jboss.logging</groupId>
+               <artifactId>jboss-logging-generator</artifactId>
+            </exclusion>
             <exclusion>
                 <groupId>org.jboss.ws.native</groupId>
                 <artifactId>jbossws-native-core</artifactId>
@@ -744,7 +759,7 @@
                <plugin>
                   <groupId>org.apache.felix</groupId>
                   <artifactId>maven-bundle-plugin</artifactId>
-                  <version>2.0.1</version>
+                  <version>${version.maven.bundle}</version>
                   <extensions>true</extensions>
                   <configuration>
                      <instructions>

diff --git a/query/pom.xml b/query/pom.xml
@@ -87,6 +87,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/server/core/pom.xml b/server/core/pom.xml
@@ -94,6 +94,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/server/hotrod/pom.xml b/server/hotrod/pom.xml
@@ -90,6 +90,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/server/memcached/pom.xml b/server/memcached/pom.xml
@@ -90,6 +90,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/server/websocket/pom.xml b/server/websocket/pom.xml
@@ -57,6 +57,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/spring/pom.xml b/spring/pom.xml
@@ -246,6 +246,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -99,6 +99,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>

diff --git a/tree/pom.xml b/tree/pom.xml
@@ -62,6 +62,7 @@
          <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
+            <version>${version.maven.bundle}</version>
             <configuration>
                <instructions>
                   <Export-Package>