bug 558284 - update org.slf4j to 1.7.30
Change-Id: I7152a2c9b7960763d927392873c117432c11fffd
Signed-off-by: Tony Homer <tony.homer@intel.com>
diff --git a/github/cronutils/com.cronutils_5.0.5/osgi.bnd b/github/cronutils/com.cronutils_5.0.5/osgi.bnd
index 8418603..3e3c728 100644
--- a/github/cronutils/com.cronutils_5.0.5/osgi.bnd
+++ b/github/cronutils/com.cronutils_5.0.5/osgi.bnd
@@ -1,5 +1,5 @@
package-version=${version;===;${Bundle-Version}}
-slf4j-api-version=${version;===;1.7.10}
+slf4j-api-version=${version;===;1.7.30}
Export-Package: \
!about.html,!about_files, \
diff --git a/github/oshi/com.github.oshi.oshi-core_3.8.0/osgi.bnd b/github/oshi/com.github.oshi.oshi-core_3.8.0/osgi.bnd
index 9dc6432..6db9492 100644
--- a/github/oshi/com.github.oshi.oshi-core_3.8.0/osgi.bnd
+++ b/github/oshi/com.github.oshi.oshi-core_3.8.0/osgi.bnd
@@ -1,6 +1,6 @@
package-version=${version;===;${Bundle-Version}}
-slf4j-api-version=${version;===;1.7.10}
+slf4j-api-version=${version;===;1.7.30}
jna-version=${version;===;4.5.1}
jna-platform-version=${version;===;4.5.1}
diff --git a/graphql/com.graphql.java_11.0.0/osgi.bnd b/graphql/com.graphql.java_11.0.0/osgi.bnd
index 52321c2..97a6c5a 100644
--- a/graphql/com.graphql.java_11.0.0/osgi.bnd
+++ b/graphql/com.graphql.java_11.0.0/osgi.bnd
@@ -1,6 +1,6 @@
package-version=${version;===;${Bundle-Version}}
antlr4-runtime-version-range=${range;[===,+);4.7.1}
-slf4j-api-version-range=${range;[===,+);1.7.10}
+slf4j-api-version-range=${range;[===,+);1.7.30}
java-dataloader-version-range=${range;[===,+);2.1.1}
reactive-streams-version-range=${range;[===,+);1.0.2}
diff --git a/logging/ch.qos.logback.core_1.1.2/osgi.bnd b/logging/ch.qos.logback.core_1.1.2/osgi.bnd
index 63c80db..0edd01d 100644
--- a/logging/ch.qos.logback.core_1.1.2/osgi.bnd
+++ b/logging/ch.qos.logback.core_1.1.2/osgi.bnd
@@ -1,5 +1,5 @@
package-version=${version;===;${Bundle-Version}}
-slf4j-version=1.7.10
+slf4j-version=1.7.30
logback-exports= \
diff --git a/logging/create-logging-recipes.sh b/logging/create-logging-recipes.sh
new file mode 100755
index 0000000..7ee3e25
--- /dev/null
+++ b/logging/create-logging-recipes.sh
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+function ebr () {
+ mvn ebr:create-recipe -DgroupId=$1 -DartifactId=$2 -Dversion=$3 -DbundleSymbolicName=$4
+}
+
+# Edit these as needed
+GIDS=(
+org.slf4j
+org.slf4j
+org.slf4j
+org.slf4j
+org.slf4j
+org.slf4j
+org.slf4j
+)
+VERSION='1.7.30'
+ARTIDS=(
+slf4j-api
+jcl-over-slf4j
+log4j-over-slf4j
+slf4j-nop
+slf4j-simple
+jul-to-slf4j
+slf4j-ext
+)
+BSNS=(
+org.slf4j.api
+org.slf4j.apis.jcl
+org.slf4j.apis.log4j
+org.slf4j.binding.nop
+org.slf4j.binding.simple
+org.slf4j.bridge.jul
+org.slf4j.ext
+)
+
+for (( i=0; i< ${#ARTIDS[@]}; i++ )); do
+ ebr ${GIDS[${i}]} ${ARTIDS[${i}]} ${VERSION} ${BSNS[${i}]}
+done
diff --git a/logging/org.slf4j.api_1.7.10/.project b/logging/org.slf4j.api_1.7.30/.project
similarity index 83%
copy from logging/org.slf4j.api_1.7.10/.project
copy to logging/org.slf4j.api_1.7.30/.project
index 781f9b0..6d7cf04 100644
--- a/logging/org.slf4j.api_1.7.10/.project
+++ b/logging/org.slf4j.api_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.api_1.7.10</name>
+ <name>org.slf4j.api_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.api_1.7.10/osgi.bnd b/logging/org.slf4j.api_1.7.30/osgi.bnd
similarity index 100%
rename from logging/org.slf4j.api_1.7.10/osgi.bnd
rename to logging/org.slf4j.api_1.7.30/osgi.bnd
diff --git a/logging/org.slf4j.api_1.7.10/pom.xml b/logging/org.slf4j.api_1.7.30/pom.xml
similarity index 93%
rename from logging/org.slf4j.api_1.7.10/pom.xml
rename to logging/org.slf4j.api_1.7.30/pom.xml
index 7065ea8..d342435 100644
--- a/logging/org.slf4j.api_1.7.10/pom.xml
+++ b/logging/org.slf4j.api_1.7.30/pom.xml
@@ -12,7 +12,7 @@
</parent>
<artifactId>org.slf4j.api</artifactId>
- <version>1.7.10-SNAPSHOT</version>
+ <version>1.7.30-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>SLF4J API Module</name>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.10</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
diff --git a/logging/org.slf4j.api_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.api_1.7.30/src/eclipse/ip_log.xml
similarity index 71%
rename from logging/org.slf4j.api_1.7.10/src/eclipse/ip_log.xml
rename to logging/org.slf4j.api_1.7.30/src/eclipse/ip_log.xml
index b22ebf8..aca6d7e 100644
--- a/logging/org.slf4j.api_1.7.10/src/eclipse/ip_log.xml
+++ b/logging/org.slf4j.api_1.7.30/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.slf4j.api" version="1.7.10" status="done">
+ <project id="org.slf4j.api" version="1.7.30" status="done">
<info>
<name>SLF4J API Module</name>
<origin>SLF4J.org</origin>
@@ -9,16 +9,16 @@
<location>logging/org.slf4j.api</location>
</info>
<contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
</contact>
<legal>
- <ipzilla bug_id="9134"/>
+ <ipzilla bug_id="21574"/>
<license>
<name>MIT license</name>
<reference>http://opensource.org/licenses/MIT</reference>
</license>
- <package>slf4j-api-1.7.10.jar</package>
+ <package>slf4j-api-1.7.30.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.api_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.api_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from logging/org.slf4j.api_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to logging/org.slf4j.api_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/logging/org.slf4j.api_1.7.10/src/main/resources/about.html b/logging/org.slf4j.api_1.7.30/src/main/resources/about.html
similarity index 91%
rename from logging/org.slf4j.api_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.api_1.7.30/src/main/resources/about.html
index d67c423..9fd96e8 100644
--- a/logging/org.slf4j.api_1.7.10/src/main/resources/about.html
+++ b/logging/org.slf4j.api_1.7.30/src/main/resources/about.html
@@ -8,13 +8,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>February 8, 2016</p>
+<p>January 16, 2020</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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>.
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, "Program" will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
@@ -40,4 +40,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/logging/org.slf4j.api_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.api_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
similarity index 100%
rename from logging/org.slf4j.api_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
rename to logging/org.slf4j.api_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/.project b/logging/org.slf4j.apis.jcl_1.7.10/.project
deleted file mode 100644
index 6a1a5f4..0000000
--- a/logging/org.slf4j.apis.jcl_1.7.10/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.slf4j.apis.jcl_1.7.10</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/pom.xml b/logging/org.slf4j.apis.jcl_1.7.10/pom.xml
deleted file mode 100644
index cb5825c..0000000
--- a/logging/org.slf4j.apis.jcl_1.7.10/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.orbit.bundles</groupId>
- <artifactId>logging</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>org.slf4j.apis.jcl</artifactId>
- <version>1.7.10-SNAPSHOT</version>
- <packaging>eclipse-bundle-recipe</packaging>
-
- <name>JCL 1.1.1 implemented over SLF4J</name>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.10</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.ebr</groupId>
- <artifactId>ebr-maven-plugin</artifactId>
- <configuration>
- <localLicenseFiles>
- <SLF4J-LICENSE.txt>MIT License</SLF4J-LICENSE.txt>
- </localLicenseFiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.apis.jcl_1.7.10/src/eclipse/ip_log.xml
deleted file mode 100644
index 6d4020c..0000000
--- a/logging/org.slf4j.apis.jcl_1.7.10/src/eclipse/ip_log.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ip_log version="1.0">
- <project id="org.slf4j.apis.jcl" version="1.7.10" status="done">
- <info>
- <name>JCL 1.1.1 implemented over SLF4J</name>
- <origin>SLF4J.org</origin>
- <reference>http://www.slf4j.org/</reference>
- <repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
- <location>logging/org.slf4j.apis.jcl</location>
- </info>
- <contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
- </contact>
- <legal>
- <ipzilla bug_id="9136"/>
- <license>
- <name>MIT license</name>
- <reference>http://opensource.org/licenses/MIT</reference>
- </license>
- <package>jcl-over-slf4j-1.7.10.jar</package>
- </legal>
- </project>
-</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 82affe5..0000000
--- a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Bundle Localization
-bundleName = JCL 1.1.1 implemented over SLF4J
-bundleVendor = Eclipse Orbit
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
deleted file mode 100644
index 48b18e3..0000000
--- a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
diff --git a/logging/org.slf4j.api_1.7.10/.project b/logging/org.slf4j.apis.jcl_1.7.30/.project
similarity index 81%
copy from logging/org.slf4j.api_1.7.10/.project
copy to logging/org.slf4j.apis.jcl_1.7.30/.project
index 781f9b0..1b8cc3c 100644
--- a/logging/org.slf4j.api_1.7.10/.project
+++ b/logging/org.slf4j.apis.jcl_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.api_1.7.10</name>
+ <name>org.slf4j.apis.jcl_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/osgi.bnd b/logging/org.slf4j.apis.jcl_1.7.30/osgi.bnd
similarity index 96%
rename from logging/org.slf4j.apis.jcl_1.7.10/osgi.bnd
rename to logging/org.slf4j.apis.jcl_1.7.30/osgi.bnd
index 5164084..12ddb04 100644
--- a/logging/org.slf4j.apis.jcl_1.7.10/osgi.bnd
+++ b/logging/org.slf4j.apis.jcl_1.7.30/osgi.bnd
@@ -1,5 +1,5 @@
package-version=${version;===;${Bundle-Version}}
-jcl-version=1.1.1
+jcl-version=1.2
Export-Package: \
!about.html,!about_files, \
diff --git a/logging/org.slf4j.apis.jcl_1.7.30/pom.xml b/logging/org.slf4j.apis.jcl_1.7.30/pom.xml
new file mode 100644
index 0000000..6811afc
--- /dev/null
+++ b/logging/org.slf4j.apis.jcl_1.7.30/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.orbit.bundles</groupId>
+ <artifactId>logging</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.slf4j.apis.jcl</artifactId>
+ <version>1.7.30-SNAPSHOT</version>
+ <packaging>eclipse-bundle-recipe</packaging>
+
+ <name>JCL 1.2 implemented over SLF4J</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.30</version>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/logging/org.slf4j.apis.jcl_1.7.30/src/eclipse/ip_log.xml b/logging/org.slf4j.apis.jcl_1.7.30/src/eclipse/ip_log.xml
new file mode 100644
index 0000000..cbda4c1
--- /dev/null
+++ b/logging/org.slf4j.apis.jcl_1.7.30/src/eclipse/ip_log.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ip_log version="1.0">
+ <project id="org.slf4j.apis.jcl" version="1.7.30" status="done">
+ <info>
+ <name>JCL 1.1.1 implemented over SLF4J</name>
+ <origin>SLF4J.org</origin>
+ <reference>http://www.slf4j.org/</reference>
+ <repository>scm:git:git.eclipse.org:/gitroot/orbit/recipes.git</repository>
+ <location>logging/org.slf4j.apis.jcl</location>
+ </info>
+ <contact>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
+ </contact>
+ <legal>
+ <ipzilla bug_id="21575"/>
+ <license>
+ <name>Apache License, 2.0</name>
+ <reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
+ </license>
+ <package>jcl-over-slf4j-1.7.30.jar</package>
+ </legal>
+ </project>
+</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..3b05bcc
--- /dev/null
+++ b/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+# Bundle Localization
+bundleName = JCL 1.2 implemented over SLF4J
+bundleVendor = Eclipse Orbit
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about.html b/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about.html
similarity index 68%
rename from logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about.html
index c53e8bb..ed81b69 100644
--- a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about.html
+++ b/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about.html
@@ -8,13 +8,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>February 8, 2016</p>
+<p>January 21, 2020</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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>.
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, "Program" will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
@@ -30,14 +30,14 @@
for informational purposes only, and you should look to the Redistributor's license for
terms and conditions of use.</p>
-<h4>JCL 1.1.1 implemented over SLF4J</h4>
+<h4>JCL 1.2 implemented over SLF4J</h4>
-<p>The plug-in includes software developed by <a href="http://www.qos.ch" target="_blank">QOS.ch</a> as part of the JCL 1.1.1 implemented over SLF4J project.</p>
+<p>The plug-in includes software developed by <a href="http://www.qos.ch" target="_blank">QOS.ch</a> as part of the JCL 1.2 implemented over SLF4J project.</p>
-<p>JCL 1.1.1 implemented over SLF4J is provided to you under the terms and conditions of the MIT License (<a href="about_files/SLF4J-LICENSE.txt" target="_blank">SLF4J-LICENSE.txt</a>) license.</p>
+<p>JCL 1.2 implemented over SLF4J is provided to you under the terms and conditions of the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">Apache Software Licenses</a> (<a href="about_files/APACHE_LICENSE__VERSION_2.0.txt" target="_blank">APACHE_SOFTWARE_LICENSES.txt</a>) license.</p>
-<p>JCL 1.1.1 implemented over SLF4J including its source is available from <a href="http://www.slf4j.org" target="_blank">www.slf4j.org</a>.</p>
+<p>JCL 1.2 implemented over SLF4J including its source is available from <a href="http://www.slf4j.org" target="_blank">www.slf4j.org</a>.</p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/APACHE_SOFTWARE_LICENSES.txt b/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
similarity index 100%
copy from logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/APACHE_SOFTWARE_LICENSES.txt
copy to logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about_files/APACHE_LICENSE__VERSION_2.0.txt
diff --git a/logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about_files/NOTICE.txt b/logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about_files/NOTICE.txt
similarity index 100%
rename from logging/org.slf4j.apis.jcl_1.7.10/src/main/resources/about_files/NOTICE.txt
rename to logging/org.slf4j.apis.jcl_1.7.30/src/main/resources/about_files/NOTICE.txt
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
deleted file mode 100644
index 48b18e3..0000000
--- a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/.project b/logging/org.slf4j.apis.log4j_1.7.30/.project
similarity index 80%
rename from logging/org.slf4j.apis.log4j_1.7.10/.project
rename to logging/org.slf4j.apis.log4j_1.7.30/.project
index 518b56c..5cd8c5d 100644
--- a/logging/org.slf4j.apis.log4j_1.7.10/.project
+++ b/logging/org.slf4j.apis.log4j_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.apis.log4j_1.7.10</name>
+ <name>org.slf4j.apis.log4j_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/osgi.bnd b/logging/org.slf4j.apis.log4j_1.7.30/osgi.bnd
similarity index 100%
rename from logging/org.slf4j.apis.log4j_1.7.10/osgi.bnd
rename to logging/org.slf4j.apis.log4j_1.7.30/osgi.bnd
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/pom.xml b/logging/org.slf4j.apis.log4j_1.7.30/pom.xml
similarity index 64%
rename from logging/org.slf4j.apis.log4j_1.7.10/pom.xml
rename to logging/org.slf4j.apis.log4j_1.7.30/pom.xml
index ff2ecb4..e741f82 100644
--- a/logging/org.slf4j.apis.log4j_1.7.10/pom.xml
+++ b/logging/org.slf4j.apis.log4j_1.7.30/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.slf4j.apis.log4j</artifactId>
- <version>1.7.10-SNAPSHOT</version>
+ <version>1.7.30-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>Log4j Implemented Over SLF4J</name>
@@ -20,22 +20,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.10</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.ebr</groupId>
- <artifactId>ebr-maven-plugin</artifactId>
- <configuration>
- <localLicenseFiles>
- <SLF4J-LICENSE.txt>MIT License</SLF4J-LICENSE.txt>
- </localLicenseFiles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.apis.log4j_1.7.30/src/eclipse/ip_log.xml
similarity index 71%
rename from logging/org.slf4j.apis.log4j_1.7.10/src/eclipse/ip_log.xml
rename to logging/org.slf4j.apis.log4j_1.7.30/src/eclipse/ip_log.xml
index 9399f7e..973658c 100644
--- a/logging/org.slf4j.apis.log4j_1.7.10/src/eclipse/ip_log.xml
+++ b/logging/org.slf4j.apis.log4j_1.7.30/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.slf4j.apis.log4j" version="1.7.10" status="done">
+ <project id="org.slf4j.apis.log4j" version="1.7.30" status="done">
<info>
<name>Log4j Implemented Over SLF4J</name>
<origin>SLF4J.org</origin>
@@ -9,16 +9,16 @@
<location>logging/org.slf4j.apis.log4j</location>
</info>
<contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
</contact>
<legal>
- <ipzilla bug_id="9137"/>
+ <ipzilla bug_id="21576"/>
<license>
<name>Apache License, 2.0</name>
<reference>http://www.apache.org/licenses/LICENSE-2.0.txt</reference>
</license>
- <package>log4j-over-slf4j-1.7.10.jar</package>
+ <package>log4j-over-slf4j-1.7.30.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about.html b/logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about.html
similarity index 91%
rename from logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about.html
index 2ceb39d..8b044f4 100644
--- a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about.html
+++ b/logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about.html
@@ -8,13 +8,13 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>February 8, 2016</p>
+<p>January 21, 2020</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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>.
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
For purposes of the EPL, "Program" will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
@@ -40,4 +40,4 @@
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/APACHE_SOFTWARE_LICENSES.txt b/logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about_files/APACHE_SOFTWARE_LICENSES.txt
similarity index 100%
rename from logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/APACHE_SOFTWARE_LICENSES.txt
rename to logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about_files/APACHE_SOFTWARE_LICENSES.txt
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/NOTICE.txt b/logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about_files/NOTICE.txt
similarity index 100%
rename from logging/org.slf4j.apis.log4j_1.7.10/src/main/resources/about_files/NOTICE.txt
rename to logging/org.slf4j.apis.log4j_1.7.30/src/main/resources/about_files/NOTICE.txt
diff --git a/logging/org.slf4j.binding.nop_1.7.10/.project b/logging/org.slf4j.binding.nop_1.7.10/.project
deleted file mode 100644
index 1cd8c16..0000000
--- a/logging/org.slf4j.binding.nop_1.7.10/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.slf4j.binding.nop_1.7.10</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/.project b/logging/org.slf4j.binding.nop_1.7.30/.project
similarity index 80%
copy from logging/org.slf4j.apis.log4j_1.7.10/.project
copy to logging/org.slf4j.binding.nop_1.7.30/.project
index 518b56c..18d5964 100644
--- a/logging/org.slf4j.apis.log4j_1.7.10/.project
+++ b/logging/org.slf4j.binding.nop_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.apis.log4j_1.7.10</name>
+ <name>org.slf4j.binding.nop_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.binding.nop_1.7.10/osgi.bnd b/logging/org.slf4j.binding.nop_1.7.30/osgi.bnd
similarity index 99%
rename from logging/org.slf4j.binding.nop_1.7.10/osgi.bnd
rename to logging/org.slf4j.binding.nop_1.7.30/osgi.bnd
index c9530dc..75f1017 100644
--- a/logging/org.slf4j.binding.nop_1.7.10/osgi.bnd
+++ b/logging/org.slf4j.binding.nop_1.7.30/osgi.bnd
@@ -9,7 +9,6 @@
Import-Package: \
org.slf4j.*;version="${range;[===,=+);${package-version}}", \
*;resolution:=optional
-
###############
# SLF4J Binding
#
diff --git a/logging/org.slf4j.binding.nop_1.7.10/pom.xml b/logging/org.slf4j.binding.nop_1.7.30/pom.xml
similarity index 93%
rename from logging/org.slf4j.binding.nop_1.7.10/pom.xml
rename to logging/org.slf4j.binding.nop_1.7.30/pom.xml
index e0df139..c39287f 100644
--- a/logging/org.slf4j.binding.nop_1.7.10/pom.xml
+++ b/logging/org.slf4j.binding.nop_1.7.30/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.slf4j.binding.nop</artifactId>
- <version>1.7.10-SNAPSHOT</version>
+ <version>1.7.30-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>SLF4J NOP Binding</name>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
- <version>1.7.10</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
diff --git a/logging/org.slf4j.binding.nop_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.binding.nop_1.7.30/src/eclipse/ip_log.xml
similarity index 71%
rename from logging/org.slf4j.binding.nop_1.7.10/src/eclipse/ip_log.xml
rename to logging/org.slf4j.binding.nop_1.7.30/src/eclipse/ip_log.xml
index 0553554..f8a79bf 100644
--- a/logging/org.slf4j.binding.nop_1.7.10/src/eclipse/ip_log.xml
+++ b/logging/org.slf4j.binding.nop_1.7.30/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.slf4j.binding.nop" version="1.7.10" status="done">
+ <project id="org.slf4j.binding.nop" version="1.7.30" status="done">
<info>
<name>SLF4J NOP Binding</name>
<origin>SLF4J.org</origin>
@@ -9,16 +9,16 @@
<location>logging/org.slf4j.binding.nop</location>
</info>
<contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
</contact>
<legal>
- <ipzilla bug_id="9139"/>
+ <ipzilla bug_id="21577"/>
<license>
<name>MIT license</name>
<reference>http://opensource.org/licenses/MIT</reference>
</license>
- <package>slf4j-nop-1.7.10.jar</package>
+ <package>slf4j-nop-1.7.30.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.binding.nop_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.binding.nop_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from logging/org.slf4j.binding.nop_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to logging/org.slf4j.binding.nop_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/logging/org.slf4j.binding.nop_1.7.10/src/main/resources/about.html b/logging/org.slf4j.binding.nop_1.7.30/src/main/resources/about.html
similarity index 100%
rename from logging/org.slf4j.binding.nop_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.binding.nop_1.7.30/src/main/resources/about.html
diff --git a/logging/org.slf4j.binding.nop_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.binding.nop_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
similarity index 100%
rename from logging/org.slf4j.binding.nop_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
rename to logging/org.slf4j.binding.nop_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
diff --git a/logging/org.slf4j.binding.simple_1.7.10/.project b/logging/org.slf4j.binding.simple_1.7.30/.project
similarity index 79%
rename from logging/org.slf4j.binding.simple_1.7.10/.project
rename to logging/org.slf4j.binding.simple_1.7.30/.project
index ccdd241..a487b71 100644
--- a/logging/org.slf4j.binding.simple_1.7.10/.project
+++ b/logging/org.slf4j.binding.simple_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.binding.simple_1.7.10</name>
+ <name>org.slf4j.binding.simple_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.binding.simple_1.7.10/osgi.bnd b/logging/org.slf4j.binding.simple_1.7.30/osgi.bnd
similarity index 99%
rename from logging/org.slf4j.binding.simple_1.7.10/osgi.bnd
rename to logging/org.slf4j.binding.simple_1.7.30/osgi.bnd
index 6887ea4..2f3dd7c 100644
--- a/logging/org.slf4j.binding.simple_1.7.10/osgi.bnd
+++ b/logging/org.slf4j.binding.simple_1.7.30/osgi.bnd
@@ -9,7 +9,6 @@
Import-Package: \
org.slf4j.*;version="${range;[===,=+);${package-version}}", \
*;resolution:=optional
-
###############
# SLF4J Binding
#
diff --git a/logging/org.slf4j.binding.simple_1.7.10/pom.xml b/logging/org.slf4j.binding.simple_1.7.30/pom.xml
similarity index 93%
rename from logging/org.slf4j.binding.simple_1.7.10/pom.xml
rename to logging/org.slf4j.binding.simple_1.7.30/pom.xml
index 123b4dd..fb2b4ae 100644
--- a/logging/org.slf4j.binding.simple_1.7.10/pom.xml
+++ b/logging/org.slf4j.binding.simple_1.7.30/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.slf4j.binding.simple</artifactId>
- <version>1.7.10-SNAPSHOT</version>
+ <version>1.7.30-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>SLF4J Simple Binding</name>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.7.10</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
diff --git a/logging/org.slf4j.binding.simple_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.binding.simple_1.7.30/src/eclipse/ip_log.xml
similarity index 71%
rename from logging/org.slf4j.binding.simple_1.7.10/src/eclipse/ip_log.xml
rename to logging/org.slf4j.binding.simple_1.7.30/src/eclipse/ip_log.xml
index b13b213..ce73693 100644
--- a/logging/org.slf4j.binding.simple_1.7.10/src/eclipse/ip_log.xml
+++ b/logging/org.slf4j.binding.simple_1.7.30/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.slf4j.binding.simple" version="1.7.10" status="done">
+ <project id="org.slf4j.binding.simple" version="1.7.30" status="done">
<info>
<name>SLF4J Simple Binding</name>
<origin>SLF4J.org</origin>
@@ -9,16 +9,16 @@
<location>logging/org.slf4j.binding.simple</location>
</info>
<contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
</contact>
<legal>
- <ipzilla bug_id="9138"/>
+ <ipzilla bug_id="21578"/>
<license>
<name>MIT license</name>
<reference>http://opensource.org/licenses/MIT</reference>
</license>
- <package>slf4j-simple-1.7.10.jar</package>
+ <package>slf4j-simple-1.7.30.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.binding.simple_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.binding.simple_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from logging/org.slf4j.binding.simple_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to logging/org.slf4j.binding.simple_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/logging/org.slf4j.binding.simple_1.7.10/src/main/resources/about.html b/logging/org.slf4j.binding.simple_1.7.30/src/main/resources/about.html
similarity index 100%
rename from logging/org.slf4j.binding.simple_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.binding.simple_1.7.30/src/main/resources/about.html
diff --git a/logging/org.slf4j.binding.simple_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.binding.simple_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
similarity index 100%
rename from logging/org.slf4j.binding.simple_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
rename to logging/org.slf4j.binding.simple_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/.project b/logging/org.slf4j.bridge.jul_1.7.10/.project
deleted file mode 100644
index 579660c..0000000
--- a/logging/org.slf4j.bridge.jul_1.7.10/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.slf4j.bridge.jul_1.7.10</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/logging/org.slf4j.apis.log4j_1.7.10/.project b/logging/org.slf4j.bridge.jul_1.7.30/.project
similarity index 80%
copy from logging/org.slf4j.apis.log4j_1.7.10/.project
copy to logging/org.slf4j.bridge.jul_1.7.30/.project
index 518b56c..902c951 100644
--- a/logging/org.slf4j.apis.log4j_1.7.10/.project
+++ b/logging/org.slf4j.bridge.jul_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.apis.log4j_1.7.10</name>
+ <name>org.slf4j.bridge.jul_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/osgi.bnd b/logging/org.slf4j.bridge.jul_1.7.30/osgi.bnd
similarity index 100%
rename from logging/org.slf4j.bridge.jul_1.7.10/osgi.bnd
rename to logging/org.slf4j.bridge.jul_1.7.30/osgi.bnd
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/pom.xml b/logging/org.slf4j.bridge.jul_1.7.30/pom.xml
similarity index 93%
rename from logging/org.slf4j.bridge.jul_1.7.10/pom.xml
rename to logging/org.slf4j.bridge.jul_1.7.30/pom.xml
index fe611c9..70176d3 100644
--- a/logging/org.slf4j.bridge.jul_1.7.10/pom.xml
+++ b/logging/org.slf4j.bridge.jul_1.7.30/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.slf4j.bridge.jul</artifactId>
- <version>1.7.10-SNAPSHOT</version>
+ <version>1.7.30-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>JUL to SLF4J bridge</name>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.7.10</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.bridge.jul_1.7.30/src/eclipse/ip_log.xml
similarity index 71%
rename from logging/org.slf4j.bridge.jul_1.7.10/src/eclipse/ip_log.xml
rename to logging/org.slf4j.bridge.jul_1.7.30/src/eclipse/ip_log.xml
index e95738e..cba9982 100644
--- a/logging/org.slf4j.bridge.jul_1.7.10/src/eclipse/ip_log.xml
+++ b/logging/org.slf4j.bridge.jul_1.7.30/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.slf4j.bridge.jul" version="1.7.10" status="done">
+ <project id="org.slf4j.bridge.jul" version="1.7.30" status="done">
<info>
<name>JUL to SLF4J bridge</name>
<origin>SLF4J.org</origin>
@@ -9,16 +9,16 @@
<location>logging/org.slf4j.bridge.jul</location>
</info>
<contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
</contact>
<legal>
- <ipzilla bug_id="9140"/>
+ <ipzilla bug_id="21579"/>
<license>
<name>MIT license</name>
<reference>http://opensource.org/licenses/MIT</reference>
</license>
- <package>jul-to-slf4j-1.7.10.jar</package>
+ <package>jul-to-slf4j-1.7.30.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.bridge.jul_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from logging/org.slf4j.bridge.jul_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to logging/org.slf4j.bridge.jul_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/src/main/resources/about.html b/logging/org.slf4j.bridge.jul_1.7.30/src/main/resources/about.html
similarity index 100%
rename from logging/org.slf4j.bridge.jul_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.bridge.jul_1.7.30/src/main/resources/about.html
diff --git a/logging/org.slf4j.bridge.jul_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.bridge.jul_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
similarity index 100%
rename from logging/org.slf4j.bridge.jul_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
rename to logging/org.slf4j.bridge.jul_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
diff --git a/logging/org.slf4j.ext_1.7.10/.project b/logging/org.slf4j.ext_1.7.10/.project
deleted file mode 100644
index 701da6a..0000000
--- a/logging/org.slf4j.ext_1.7.10/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.slf4j.ext_1.7.10</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/logging/org.slf4j.api_1.7.10/.project b/logging/org.slf4j.ext_1.7.30/.project
similarity index 83%
rename from logging/org.slf4j.api_1.7.10/.project
rename to logging/org.slf4j.ext_1.7.30/.project
index 781f9b0..b93f180 100644
--- a/logging/org.slf4j.api_1.7.10/.project
+++ b/logging/org.slf4j.ext_1.7.30/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.slf4j.api_1.7.10</name>
+ <name>org.slf4j.ext_1.7.30</name>
<comment></comment>
<projects>
</projects>
diff --git a/logging/org.slf4j.ext_1.7.10/osgi.bnd b/logging/org.slf4j.ext_1.7.30/osgi.bnd
similarity index 99%
rename from logging/org.slf4j.ext_1.7.10/osgi.bnd
rename to logging/org.slf4j.ext_1.7.30/osgi.bnd
index 3a30807..7b7a944 100644
--- a/logging/org.slf4j.ext_1.7.10/osgi.bnd
+++ b/logging/org.slf4j.ext_1.7.30/osgi.bnd
@@ -8,7 +8,6 @@
*;version="${package-version}"
Require-Bundle: org.slf4j.api;bundle-version="${range;[===,=+);${package-version}}"
-
Import-Package: \
!org.slf4j*, \
*;resolution:=optional
diff --git a/logging/org.slf4j.ext_1.7.10/pom.xml b/logging/org.slf4j.ext_1.7.30/pom.xml
similarity index 94%
rename from logging/org.slf4j.ext_1.7.10/pom.xml
rename to logging/org.slf4j.ext_1.7.30/pom.xml
index fbaa677..212312c 100644
--- a/logging/org.slf4j.ext_1.7.10/pom.xml
+++ b/logging/org.slf4j.ext_1.7.30/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.slf4j.ext</artifactId>
- <version>1.7.10-SNAPSHOT</version>
+ <version>1.7.30-SNAPSHOT</version>
<packaging>eclipse-bundle-recipe</packaging>
<name>SLF4J Extensions Module</name>
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
- <version>1.7.10</version>
+ <version>1.7.30</version>
</dependency>
</dependencies>
diff --git a/logging/org.slf4j.ext_1.7.10/src/eclipse/ip_log.xml b/logging/org.slf4j.ext_1.7.30/src/eclipse/ip_log.xml
similarity index 71%
rename from logging/org.slf4j.ext_1.7.10/src/eclipse/ip_log.xml
rename to logging/org.slf4j.ext_1.7.30/src/eclipse/ip_log.xml
index 7272cb7..b073d51 100644
--- a/logging/org.slf4j.ext_1.7.10/src/eclipse/ip_log.xml
+++ b/logging/org.slf4j.ext_1.7.30/src/eclipse/ip_log.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ip_log version="1.0">
- <project id="org.slf4j.ext" version="1.7.10" status="done">
+ <project id="org.slf4j.ext" version="1.7.30" status="done">
<info>
<name>SLF4J Extensions Module</name>
<origin>SLF4J.org</origin>
@@ -9,16 +9,16 @@
<location>logging/org.slf4j.ext</location>
</info>
<contact>
- <name>Gunnar Wagenknecht</name>
- <email>gunnar@wagenknecht.org</email>
+ <name>Tony Homer</name>
+ <email>tony.homer@intel.com</email>
</contact>
<legal>
- <ipzilla bug_id="9135"/>
+ <ipzilla bug_id="21580"/>
<license>
<name>MIT license</name>
<reference>http://opensource.org/licenses/MIT</reference>
</license>
- <package>slf4j-ext-1.7.10.jar</package>
+ <package>slf4j-ext-1.7.30.jar</package>
</legal>
</project>
</ip_log>
\ No newline at end of file
diff --git a/logging/org.slf4j.ext_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties b/logging/org.slf4j.ext_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from logging/org.slf4j.ext_1.7.10/src/main/resources/OSGI-INF/l10n/bundle.properties
rename to logging/org.slf4j.ext_1.7.30/src/main/resources/OSGI-INF/l10n/bundle.properties
diff --git a/logging/org.slf4j.ext_1.7.10/src/main/resources/about.html b/logging/org.slf4j.ext_1.7.30/src/main/resources/about.html
similarity index 100%
rename from logging/org.slf4j.ext_1.7.10/src/main/resources/about.html
rename to logging/org.slf4j.ext_1.7.30/src/main/resources/about.html
diff --git a/logging/org.slf4j.ext_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt b/logging/org.slf4j.ext_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
similarity index 100%
rename from logging/org.slf4j.ext_1.7.10/src/main/resources/about_files/SLF4J-LICENSE.txt
rename to logging/org.slf4j.ext_1.7.30/src/main/resources/about_files/SLF4J-LICENSE.txt
diff --git a/logging/pom.xml b/logging/pom.xml
index 593fd53..0715e6d 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -15,13 +15,13 @@
<name>Eclipse Orbit :: Logging Recipes</name>
<modules>
- <module>org.slf4j.api_1.7.10</module>
- <module>org.slf4j.apis.jcl_1.7.10</module>
- <module>org.slf4j.apis.log4j_1.7.10</module>
- <module>org.slf4j.binding.nop_1.7.10</module>
- <module>org.slf4j.binding.simple_1.7.10</module>
- <module>org.slf4j.bridge.jul_1.7.10</module>
- <module>org.slf4j.ext_1.7.10</module>
+ <module>org.slf4j.api_1.7.30</module>
+ <module>org.slf4j.apis.jcl_1.7.30</module>
+ <module>org.slf4j.apis.log4j_1.7.30</module>
+ <module>org.slf4j.binding.nop_1.7.30</module>
+ <module>org.slf4j.binding.simple_1.7.30</module>
+ <module>org.slf4j.bridge.jul_1.7.30</module>
+ <module>org.slf4j.ext_1.7.30</module>
<module>ch.qos.logback.core_1.1.2</module>
<module>ch.qos.logback.classic_1.1.2</module>
<module>ch.qos.logback.slf4j_1.1.2</module>
diff --git a/releng/aggregationfeature/feature.xml b/releng/aggregationfeature/feature.xml
index 08c9883..5a75852 100644
--- a/releng/aggregationfeature/feature.xml
+++ b/releng/aggregationfeature/feature.xml
@@ -98,13 +98,13 @@
<plugin id="org.apache.sshd.sftp" version="2.2.0.qualifier"/>
<plugin id="org.apache.sshd.putty" version="2.2.0.qualifier"/>
- <plugin id="org.slf4j.api" version="1.7.10.qualifier"/>
- <plugin id="org.slf4j.ext" version="1.7.10.qualifier"/>
- <plugin id="org.slf4j.apis.jcl" version="1.7.10.qualifier"/>
- <plugin id="org.slf4j.apis.log4j" version="1.7.10.qualifier"/>
- <plugin id="org.slf4j.bridge.jul" version="1.7.10.qualifier"/>
- <plugin id="org.slf4j.binding.nop" version="1.7.10.qualifier"/>
- <plugin id="org.slf4j.binding.simple" version="1.7.10.qualifier"/>
+ <plugin id="org.slf4j.api" version="1.7.30.qualifier"/>
+ <plugin id="org.slf4j.ext" version="1.7.30.qualifier"/>
+ <plugin id="org.slf4j.apis.jcl" version="1.7.30.qualifier"/>
+ <plugin id="org.slf4j.apis.log4j" version="1.7.30.qualifier"/>
+ <plugin id="org.slf4j.bridge.jul" version="1.7.30.qualifier"/>
+ <plugin id="org.slf4j.binding.nop" version="1.7.30.qualifier"/>
+ <plugin id="org.slf4j.binding.simple" version="1.7.30.qualifier"/>
<plugin id="ch.qos.logback.core" version="1.1.2.qualifier"/>
<plugin id="ch.qos.logback.classic" version="1.1.2.qualifier"/>
