HSEARCH-941 Update JBoss Logger to 3.0.1.GA

hibernate · Oct 5, 2011 · 7dbc30b · 7dbc30b
1 parent 1270083
commit 7dbc30b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -141,8 +141,8 @@
         <hibernateVersion>4.0.0.CR4</hibernateVersion>
         <hibernateCommonsAnnotationVersion>4.0.0.CR2</hibernateCommonsAnnotationVersion>
         <bytemanVersion>1.5.2</bytemanVersion>
-        <jbossLoggingVersion>3.0.0.GA</jbossLoggingVersion>
-        <jbossLoggingProcessorVersion>1.0.0.Beta7</jbossLoggingProcessorVersion>
+        <jbossLoggingVersion>3.0.1.GA</jbossLoggingVersion>
+        <jbossLoggingProcessorVersion>1.0.0.CR1</jbossLoggingProcessorVersion>
     </properties>
 
     <dependencies>
@@ -446,7 +446,7 @@
                             <phase>generate-sources</phase>
                             <configuration>
                                 <processors>
-                                    <processor>org.jboss.logging.LoggingToolsProcessor</processor>
+                                    <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
                                 </processors>
                             </configuration>
                         </execution>
@@ -459,7 +459,7 @@
                             <phase>generate-test-sources</phase>
                             <configuration>
                                 <processors>
-                                    <processor>org.jboss.logging.LoggingToolsProcessor</processor>
+                                    <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
                                 </processors>
                             </configuration>
                         </execution>

diff --git a/src/main/assembly/dist.xml b/src/main/assembly/dist.xml
@@ -81,6 +81,7 @@
                             <exclude>org.infinispan:*</exclude>
                             <exclude>org.rhq.helpers:*</exclude>
                             <exclude>org.jboss.marshalling:*</exclude>
+                            <exclude>org.jboss.spec.javax.transaction:*</exclude>
                         </excludes>
                     </dependencySet>
 
@@ -106,6 +107,7 @@
                             <exclude>org.jgroups:jgroups</exclude>
                             <exclude>xml-apis:xml-apis</exclude>
                             <exclude>org.jboss.javaee:jboss-transaction-api</exclude>
+                            <exclude>org.jboss.spec.javax.transaction:*</exclude>
                             <exclude>org.infinispan:*</exclude>
                             <exclude>org.jboss.marshalling:*</exclude>
                         </excludes>
@@ -117,6 +119,11 @@
                         <includes>
                             <include>org.jboss.javaee:jboss-transaction-api</include>
                         </includes>
+                        <excludes>
+                            <exclude>org.jboss.logging:jboss-logging-generator</exclude>
+                            <exclude>org.jboss.logging:jboss-logging-processor</exclude>
+                            <exclude>org.jboss.spec.javax.transaction:*</exclude>
+                        </excludes>
                     </dependencySet>
                 </dependencySets>
             </binaries>
@@ -202,6 +209,11 @@
                         <useProjectArtifact>false</useProjectArtifact>
                         <outputDirectory>/dist/lib/provided</outputDirectory>
                         <scope>provided</scope>
+                        <excludes>
+                            <exclude>org.jboss.logging:jboss-logging-generator</exclude>
+                            <exclude>org.jboss.logging:jboss-logging-processor</exclude>
+                            <exclude>org.jboss.spec.javax.transaction:*</exclude>
+                        </excludes>
                     </dependencySet>
                 </dependencySets>
             </binaries>