From e2d347c2a7eb55a28d220783409d6a6063c32763 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Thu, 28 May 2015 16:46:15 -0500
Subject: [PATCH] HHH-9830 - Upgrade to jboss-logging 3.3 Final (rather than
 Beta)

---
 build.gradle                                    |  9 +++++++--
 hibernate-osgi/hibernate-osgi.gradle            | 15 +++++++++++++++
 .../osgi/test/OsgiIntegrationTest.java          | 17 ++++++++++++-----
 libraries.gradle                                |  6 +++---
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 455fb1637c..2e8e20a14d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,6 +111,9 @@ subprojects { subProject ->
 			// todo : need to make sure these are non-exported
 			description = 'Non-exported compile-time dependencies.'
 		}
+		jbossLoggingTool {
+			description = 'Dependencies for running the jboss-logging tooling.'
+		}
 		configurations {
 			all*.exclude group: 'xml-apis', module: 'xml-apis'
 		}
@@ -119,8 +122,9 @@ subprojects { subProject ->
 	// appropriately inject the common dependencies into each sub-project
 	dependencies {
 		compile( libraries.logging )
-		compile( libraries.logging_annotations )
-		compile( libraries.logging_processor )
+
+		jbossLoggingTool( libraries.logging_annotations )
+		jbossLoggingTool( libraries.logging_processor )
 
 		testCompile( libraries.junit )
 		testCompile( libraries.byteman )
@@ -151,6 +155,7 @@ subprojects { subProject ->
 
 	sourceSets.main {
 		compileClasspath += configurations.provided
+		compileClasspath += configurations.jbossLoggingTool
 	}
 
 	jar {
diff --git a/hibernate-osgi/hibernate-osgi.gradle b/hibernate-osgi/hibernate-osgi.gradle
index 40363a2c90..54d0ebc3a7 100644
--- a/hibernate-osgi/hibernate-osgi.gradle
+++ b/hibernate-osgi/hibernate-osgi.gradle
@@ -124,6 +124,21 @@ karafFeatures {
 					rootProject.childProjects.'hibernate-entitymanager',
 					project
 			]
+			// According to Christian Schneider, these should not be needed
+			bundle {
+				match {
+					group = 'org.osgi'
+					module = 'org.osgi.core'
+				}
+				include = false
+			}
+			bundle {
+				match {
+					group = 'org.osgi'
+					module = 'org.osgi.compendium'
+				}
+				include = false
+			}
 			bundle {
 				match {
 					group = 'org.jboss.logging'
diff --git a/hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiIntegrationTest.java b/hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiIntegrationTest.java
index fb263f84e7..2b7d05e5d6 100644
--- a/hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiIntegrationTest.java
+++ b/hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiIntegrationTest.java
@@ -59,6 +59,7 @@ import static org.ops4j.pax.exam.CoreOptions.repository;
 import static org.ops4j.pax.exam.CoreOptions.when;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.debugConfiguration;
+import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFileExtend;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
@@ -94,12 +95,18 @@ public class OsgiIntegrationTest {
 						.frameworkUrl( paxExamEnvironment.getProperty( "org.ops4j.pax.exam.container.karaf.distroUrl" ) )
 						.karafVersion( paxExamEnvironment.getProperty( "org.ops4j.pax.exam.container.karaf.version" ) )
 						.name( "Apache Karaf" )
-						.unpackDirectory( new File( paxExamEnvironment.getProperty( "org.ops4j.pax.exam.container.karaf.unpackDir" ) ) )
+						.unpackDirectory(
+								new File(
+										paxExamEnvironment.getProperty(
+												"org.ops4j.pax.exam.container.karaf.unpackDir"
+										)
+								)
+						)
 						.useDeployFolder( false ),
-				repositories(
-						repository( "https://repository.jboss.org/nexus/content/groups/public-jboss/" )
-								.id( "jboss-nexus" )
-								.allowSnapshots()
+				editConfigurationFileExtend(
+						"etc/org.ops4j.pax.url.mvn.cfg",
+						"org.ops4j.pax.url.mvn.repositories",
+						"https://repository.jboss.org/nexus/content/groups/public/"
 				),
 				configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
 				when( debug ).useOptions( keepRuntimeFolder() ),
diff --git a/libraries.gradle b/libraries.gradle
index 9679c1e05d..9689b04cb9 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -46,9 +46,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.3.0.Beta1',
-            logging_annotations: 'org.jboss.logging:jboss-logging-annotations:1.2.0.Final',
-            logging_processor:  'org.jboss.logging:jboss-logging-processor:1.2.0.Final',
+            logging:        'org.jboss.logging:jboss-logging:3.3.0.Final',
+            logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.0.0.Final',
+            logging_processor:  'org.jboss.logging:jboss-logging-processor:2.0.0.Final',
 
             slf4j_api:                 "org.slf4j:slf4j-api:1.7.5",
             slf4j_log4j:               "org.slf4j:slf4j-log4j12:1.7.5",