HHH-9830 - Upgrade to jboss-logging 3.3 Final (rather than Beta)
This commit is contained in:
parent
e7e906441f
commit
e2d347c2a7
|
@ -111,6 +111,9 @@ subprojects { subProject ->
|
||||||
// todo : need to make sure these are non-exported
|
// todo : need to make sure these are non-exported
|
||||||
description = 'Non-exported compile-time dependencies.'
|
description = 'Non-exported compile-time dependencies.'
|
||||||
}
|
}
|
||||||
|
jbossLoggingTool {
|
||||||
|
description = 'Dependencies for running the jboss-logging tooling.'
|
||||||
|
}
|
||||||
configurations {
|
configurations {
|
||||||
all*.exclude group: 'xml-apis', module: 'xml-apis'
|
all*.exclude group: 'xml-apis', module: 'xml-apis'
|
||||||
}
|
}
|
||||||
|
@ -119,8 +122,9 @@ subprojects { subProject ->
|
||||||
// appropriately inject the common dependencies into each sub-project
|
// appropriately inject the common dependencies into each sub-project
|
||||||
dependencies {
|
dependencies {
|
||||||
compile( libraries.logging )
|
compile( libraries.logging )
|
||||||
compile( libraries.logging_annotations )
|
|
||||||
compile( libraries.logging_processor )
|
jbossLoggingTool( libraries.logging_annotations )
|
||||||
|
jbossLoggingTool( libraries.logging_processor )
|
||||||
|
|
||||||
testCompile( libraries.junit )
|
testCompile( libraries.junit )
|
||||||
testCompile( libraries.byteman )
|
testCompile( libraries.byteman )
|
||||||
|
@ -151,6 +155,7 @@ subprojects { subProject ->
|
||||||
|
|
||||||
sourceSets.main {
|
sourceSets.main {
|
||||||
compileClasspath += configurations.provided
|
compileClasspath += configurations.provided
|
||||||
|
compileClasspath += configurations.jbossLoggingTool
|
||||||
}
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
|
|
|
@ -124,6 +124,21 @@ karafFeatures {
|
||||||
rootProject.childProjects.'hibernate-entitymanager',
|
rootProject.childProjects.'hibernate-entitymanager',
|
||||||
project
|
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 {
|
bundle {
|
||||||
match {
|
match {
|
||||||
group = 'org.jboss.logging'
|
group = 'org.jboss.logging'
|
||||||
|
|
|
@ -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.CoreOptions.when;
|
||||||
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
|
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.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.features;
|
||||||
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
|
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
|
||||||
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
|
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" ) )
|
.frameworkUrl( paxExamEnvironment.getProperty( "org.ops4j.pax.exam.container.karaf.distroUrl" ) )
|
||||||
.karafVersion( paxExamEnvironment.getProperty( "org.ops4j.pax.exam.container.karaf.version" ) )
|
.karafVersion( paxExamEnvironment.getProperty( "org.ops4j.pax.exam.container.karaf.version" ) )
|
||||||
.name( "Apache Karaf" )
|
.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 ),
|
.useDeployFolder( false ),
|
||||||
repositories(
|
editConfigurationFileExtend(
|
||||||
repository( "https://repository.jboss.org/nexus/content/groups/public-jboss/" )
|
"etc/org.ops4j.pax.url.mvn.cfg",
|
||||||
.id( "jboss-nexus" )
|
"org.ops4j.pax.url.mvn.repositories",
|
||||||
.allowSnapshots()
|
"https://repository.jboss.org/nexus/content/groups/public/"
|
||||||
),
|
),
|
||||||
configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
|
configureConsole().ignoreLocalConsole().ignoreRemoteShell(),
|
||||||
when( debug ).useOptions( keepRuntimeFolder() ),
|
when( debug ).useOptions( keepRuntimeFolder() ),
|
||||||
|
|
|
@ -46,9 +46,9 @@ ext {
|
||||||
jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',
|
jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final',
|
||||||
|
|
||||||
// logging
|
// logging
|
||||||
logging: 'org.jboss.logging:jboss-logging:3.3.0.Beta1',
|
logging: 'org.jboss.logging:jboss-logging:3.3.0.Final',
|
||||||
logging_annotations: 'org.jboss.logging:jboss-logging-annotations:1.2.0.Final',
|
logging_annotations: 'org.jboss.logging:jboss-logging-annotations:2.0.0.Final',
|
||||||
logging_processor: 'org.jboss.logging:jboss-logging-processor:1.2.0.Final',
|
logging_processor: 'org.jboss.logging:jboss-logging-processor:2.0.0.Final',
|
||||||
|
|
||||||
slf4j_api: "org.slf4j:slf4j-api:1.7.5",
|
slf4j_api: "org.slf4j:slf4j-api:1.7.5",
|
||||||
slf4j_log4j: "org.slf4j:slf4j-log4j12:1.7.5",
|
slf4j_log4j: "org.slf4j:slf4j-log4j12:1.7.5",
|
||||||
|
|
Loading…
Reference in New Issue