481708 - bumps logback version from 1.0.7 to 1.1.3
diff --git a/build.gradle b/build.gradle
index 3df5d3a..8b4c9bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,6 @@
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
testCompile project(':test:org.eclipse.virgo.test.stubs')
- // testRuntime group: "org.eclipse.virgo.mirrored", name: "ch.qos.logback.slf4j", version: logbackVersion, configuration: "compile", ext: "jar"
testRuntime "org.aspectj:aspectjrt:${project.aspectjVersion}"
compile project(':medic:org.eclipse.virgo.medic')
@@ -27,10 +26,8 @@
compile 'org.fusesource.jansi:jansi:1.11'
-// compile group: "org.eclipse.virgo.mirrored", name: "ch.qos.logback.core", version: logbackVersion, configuration: "compile", ext: "jar"
-// compile group: "org.eclipse.virgo.mirrored", name: "ch.qos.logback.classic", version: logbackVersion, configuration: "compile", ext: "jar"
- compile 'ch.qos.logback:logback-core:1.1.3'
- compile 'ch.qos.logback:logback-classic:1.1.3'
+ compile "ch.qos.logback:logback-core:${logbackVersion}"
+ compile "ch.qos.logback:logback-classic:${logbackVersion}"
}
}
@@ -38,8 +35,8 @@
dependencies {
compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
- compile 'ch.qos.logback:logback-core:1.1.3'
- compile 'ch.qos.logback:logback-classic:1.1.3'
+ compile "ch.qos.logback:logback-core:${logbackVersion}"
+ compile "ch.qos.logback:logback-classic:${logbackVersion}"
}
}
diff --git a/org.eclipse.virgo.medic.slf4japifragment/template.mf b/org.eclipse.virgo.medic.slf4japifragment/template.mf
index 93ce5b1..93bd9ba 100644
--- a/org.eclipse.virgo.medic.slf4japifragment/template.mf
+++ b/org.eclipse.virgo.medic.slf4japifragment/template.mf
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Bundle-Vendor: fake
Bundle-Localization: fragment
-Fragment-Host: org.slf4j.api;bundle-version="[1.7.2,1.7.3)"
+Fragment-Host: org.slf4j.api;bundle-version="${slf4jVersion:[=.=.=, +1.0.0)}"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6,JavaSE-1.7
Bundle-Name: fake
Bundle-SymbolicName: org.eclipse.virgo.medic.slf4japifragment
-Require-Bundle: ch.qos.logback.core;bundle-version="[1.0.7,1.0.8)",ch.
- qos.logback.classic;bundle-version="[1.0.7,1.0.8)"
+Require-Bundle: ch.qos.logback.core;bundle-version="${logbackVersion:[=.=.=, +1.0.0)}",ch.
+ qos.logback.classic;bundle-version="${logbackVersion:[=.=.=, +1.0.0)}"
Export-Package: org.slf4j.impl; uses:="org.slf4j.spi,ch.qos.logback.cl
assic.util,org.slf4j.helpers,ch.qos.logback.classic,ch.qos.logback.co
re,ch.qos.logback.classic.selector,ch.qos.logback.core.joran.spi,org.
- slf4j,ch.qos.logback.core.util";version="1.7.2"
+ slf4j,ch.qos.logback.core.util";version="${slf4jVersion}"
Bundle-Version: ${version}
Bundle-ManifestVersion: 2
Excluded-Imports: *
