Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Waibel2015-12-10 13:39:28 -0500
committerFlorian Waibel2016-03-08 15:52:19 -0500
commitc64a96f423b7d66f774eeb000e986b7ddff31323 (patch)
tree02fd48e089466f42bb11102209211411317ecf6e
parentae5e32da9434a1c438f00c5f6c4edaec3dd21d8c (diff)
downloadorg.eclipse.virgo.medic-c64a96f423b7d66f774eeb000e986b7ddff31323.tar.gz
org.eclipse.virgo.medic-c64a96f423b7d66f774eeb000e986b7ddff31323.tar.xz
org.eclipse.virgo.medic-c64a96f423b7d66f774eeb000e986b7ddff31323.zip
481708 - bumps slf4j version from 1.7.2 to 1.7.13
-rw-r--r--build.gradle8
-rw-r--r--org.eclipse.virgo.medic.slf4japifragment/src/main/resources/about.html28
-rw-r--r--org.eclipse.virgo.medic.slf4japifragment/template.mf2
3 files changed, 33 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle
index 8b4c9bb..ee7fc52 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ project(':medic:org.eclipse.virgo.medic') {
dependencies {
testCompile group: 'org.easymock', name: 'easymock', version: easymockVersion
- compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+ compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
}
@@ -21,8 +21,8 @@ project(':medic:org.eclipse.virgo.medic.core') {
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi", version: equinoxVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.osgi.services", version: osgiServicesVersion, configuration: "compile", ext: "jar"
compile group: "org.eclipse.virgo.mirrored", name: "org.eclipse.equinox.cm", version: equinoxCmVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
- compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.jul", version: slf4jVersion, configuration: "compile", ext: "jar"
+ compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
+ compile group: "org.slf4j", name: "jul-to-slf4j", version: slf4jVersion
compile 'org.fusesource.jansi:jansi:1.11'
@@ -33,7 +33,7 @@ project(':medic:org.eclipse.virgo.medic.core') {
project(':medic:org.eclipse.virgo.medic.slf4japifragment') {
dependencies {
- compile group: "org.eclipse.virgo.mirrored", name: "org.slf4j.api", version: slf4jVersion, configuration: "compile", ext: "jar"
+ compile group: "org.slf4j", name: "slf4j-api", version: slf4jVersion
compile "ch.qos.logback:logback-core:${logbackVersion}"
compile "ch.qos.logback:logback-classic:${logbackVersion}"
diff --git a/org.eclipse.virgo.medic.slf4japifragment/src/main/resources/about.html b/org.eclipse.virgo.medic.slf4japifragment/src/main/resources/about.html
new file mode 100644
index 0000000..c258ef5
--- /dev/null
+++ b/org.eclipse.virgo.medic.slf4japifragment/src/main/resources/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.virgo.medic.slf4japifragment/template.mf b/org.eclipse.virgo.medic.slf4japifragment/template.mf
index 93bd9ba..0316a5e 100644
--- a/org.eclipse.virgo.medic.slf4japifragment/template.mf
+++ b/org.eclipse.virgo.medic.slf4japifragment/template.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Vendor: fake
Bundle-Localization: fragment
-Fragment-Host: org.slf4j.api;bundle-version="${slf4jVersion:[=.=.=, +1.0.0)}"
+Fragment-Host: 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

Back to the top