HHH-8499 - Prepare for 4.3 Beta4 release

Author: sebersole

build.gradle

@@ -23,7 +23,7 @@ buildscript {
     dependencies {
         classpath 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1'
         classpath 'org.hibernate.build.gradle:hibernate-matrix-testing:1.0.0-SNAPSHOT'
-        classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0-SNAPSHOT'
+        classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0'
     }
 }
 
@@ -118,6 +118,7 @@ subprojects { subProject ->
         // appropriately inject the common dependencies into each sub-project
         dependencies {
             compile( libraries.logging )
+            compile( libraries.logging_annotations )
 
             testCompile( libraries.junit )
             testCompile( libraries.byteman )

hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0MessageLogger.java

@@ -25,10 +25,10 @@
 
 import java.sql.SQLException;
 
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import org.hibernate.internal.CoreMessageLogger;
 

hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java

@@ -60,10 +60,10 @@
 import org.hibernate.type.SerializationException;
 import org.hibernate.type.Type;
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 /**
  * The jboss-logging {@link MessageLogger} for the hibernate-core module.  It reserves message ids ranging from

hibernate-ehcache/src/main/java/org/hibernate/cache/ehcache/EhCacheMessageLogger.java

@@ -23,9 +23,10 @@
  */
 package org.hibernate.cache.ehcache;
 
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import org.hibernate.internal.CoreMessageLogger;
 

hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerMessageLogger.java

@@ -26,10 +26,10 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.jboss.logging.Cause;
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.Cause;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import org.hibernate.internal.CoreMessageLogger;
 

hibernate-envers/src/main/java/org/hibernate/envers/internal/EnversMessageLogger.java

@@ -23,9 +23,9 @@
  */
 package org.hibernate.envers.internal;
 
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import org.hibernate.internal.CoreMessageLogger;
 

hibernate-proxool/src/main/java/org/hibernate/proxool/internal/ProxoolMessageLogger.java

@@ -23,9 +23,9 @@
  */
 package org.hibernate.proxool.internal;
 
-import org.jboss.logging.LogMessage;
-import org.jboss.logging.Message;
-import org.jboss.logging.MessageLogger;
+import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.annotations.Message;
+import org.jboss.logging.annotations.MessageLogger;
 
 import org.hibernate.internal.CoreMessageLogger;
 

libraries.gradle

@@ -60,8 +60,9 @@ ext {
             jacc:           'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',
 
             // logging
-            logging:        'org.jboss.logging:jboss-logging:3.1.0.GA',
-            logging_processor:  'org.jboss.logging:jboss-logging-processor:1.0.0.Final',
+            logging:        'org.jboss.logging:jboss-logging:3.1.3.GA',
+            logging_annotations: 'org.jboss.logging:jboss-logging-annotations:1.2.0.Beta1',
+            logging_processor:  'org.jboss.logging:jboss-logging-processor:1.2.0.Beta1',
 
             // jaxb task
             jaxb:           'com.sun.xml.bind:jaxb-xjc:2.1.6',