diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-05-01 23:33:00 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-05-02 17:05:18 +0200 |
| commit | 84461e808663d0830360a8cfbbcc4a80c96ab3ed (patch) | |
| tree | 5a1625333f0e15cae49bfda69aebac875a1bad6c | |
| parent | 18cb13c4ef4bcdf3210e932bd9fbb602ddf234fc (diff) | |
| download | jgit-84461e808663d0830360a8cfbbcc4a80c96ab3ed.tar.gz jgit-84461e808663d0830360a8cfbbcc4a80c96ab3ed.zip | |
Update slf4j to 1.7.36 and consume it directly from Maven Central
BundleSymbolicNames changed to the names used upstream:
- slf4j.api
- slf4j.simple
Change-Id: Ibcaafae282d3a6fa013bc39d879def1b66073bca
18 files changed, 200 insertions, 66 deletions
@@ -130,14 +130,14 @@ maven_jar( maven_jar( name = "log-api", - artifact = "org.slf4j:slf4j-api:1.7.30", - sha1 = "b5a4b6d16ab13e34a88fae84c35cd5d68cac922c", + artifact = "org.slf4j:slf4j-api:1.7.36", + sha1 = "6c62681a2f655b49963a5983b8b0950a6120ae14", ) maven_jar( name = "slf4j-simple", - artifact = "org.slf4j:slf4j-simple:1.7.30", - sha1 = "e606eac955f55ecf1d8edcccba04eb8ac98088dd", + artifact = "org.slf4j:slf4j-simple:1.7.36", + sha1 = "a41f9cfe6faafb2eb83a1c7dd2d0dfd844e2a936", ) maven_jar( diff --git a/org.eclipse.jgit.http.test/build.properties b/org.eclipse.jgit.http.test/build.properties index a12a660466..0dc5baea36 100644 --- a/org.eclipse.jgit.http.test/build.properties +++ b/org.eclipse.jgit.http.test/build.properties @@ -4,4 +4,4 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties -additional.bundles = org.slf4j.binding.simple +additional.bundles = slf4j.simple diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml index 3f0ed6f360..a5d2304ba0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -210,16 +210,16 @@ <bundle id="org.kohsuke.args4j.source"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.slf4j.api"> + <bundle id="slf4j.api"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.slf4j.api.source"> + <bundle id="slf4j.api.source"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.slf4j.binding.simple"> + <bundle id="slf4j.simple"> <category name="JGit-dependency-bundles"/> </bundle> - <bundle id="org.slf4j.binding.simple.source"> + <bundle id="slf4j.simple.source"> <category name="JGit-dependency-bundles"/> </bundle> <bundle id="org.tukaani.xz"> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index fbfd44fed1..1896090648 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.17" sequenceNumber="1682955065"> +<target name="jgit-4.17" sequenceNumber="1682976650"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2020-09/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 886dc5052f..da26dbd3cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.18" sequenceNumber="1682955065"> +<target name="jgit-4.18" sequenceNumber="1682976650"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2020-12/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index a49cd2d69a..c9eab15b0e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.19-staging" sequenceNumber="1682955065"> +<target name="jgit-4.19-staging" sequenceNumber="1682976650"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-03/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index e792dc9202..278db4fa3f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.20" sequenceNumber="1682955065"> +<target name="jgit-4.20" sequenceNumber="1682976650"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-06/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 6ce9bef54c..01f012141e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.21" sequenceNumber="1682955065"> +<target name="jgit-4.21" sequenceNumber="1682976650"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-09/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 4dad5f761a..6c3c28877e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.22" sequenceNumber="1682955063"> +<target name="jgit-4.22" sequenceNumber="1682976649"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2021-12/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 44ab7e4928..b7c96aba1d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.23" sequenceNumber="1682955063"> +<target name="jgit-4.23" sequenceNumber="1682976649"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-03/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 3075755462..2efe3f065f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.24" sequenceNumber="1682955063"> +<target name="jgit-4.24" sequenceNumber="1682976649"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-06/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index f98579f663..5894ace310 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.25" sequenceNumber="1682955063"> +<target name="jgit-4.25" sequenceNumber="1682976649"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-09/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index a5bc0e82b1..0bb881dfda 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.26" sequenceNumber="1682955063"> +<target name="jgit-4.26" sequenceNumber="1682976649"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.google.gson" version="2.10.1.v20230109-0753"/> @@ -46,10 +46,6 @@ <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> - <unit id="org.slf4j.api" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20221112-0806"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20221112-0806"/> <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository"/> @@ -58,6 +54,22 @@ <unit id="org.eclipse.osgi" version="0.0.0"/> <repository location="https://download.eclipse.org/releases/2022-12/"/> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 39beb100d5..cb1ab479a9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -120,3 +120,21 @@ maven jetty version = "4.0.4" } } + +maven slf4j + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.slf4j" + artifactId = "slf4j-api" + version = "1.7.36" + } + dependency { + groupId = "org.slf4j" + artifactId = "slf4j-simple" + version = "1.7.36" + } +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd index 137b3e6122..ff707c36c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd @@ -44,10 +44,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 org.mockito.mockito-core.source [4.8.1.v20221103-2317,4.8.1.v20221103-2317] org.objenesis [3.3.0.v20221103-2317,3.3.0.v20221103-2317] org.objenesis.source [3.3.0.v20221103-2317,3.3.0.v20221103-2317] - org.slf4j.api [1.7.30.v20221112-0806,1.7.30.v20221112-0806] - org.slf4j.api.source [1.7.30.v20221112-0806,1.7.30.v20221112-0806] - org.slf4j.binding.simple [1.7.30.v20221112-0806,1.7.30.v20221112-0806] - org.slf4j.binding.simple.source [1.7.30.v20221112-0806,1.7.30.v20221112-0806] org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] } diff --git a/org.eclipse.jgit.ssh.apache.test/build.properties b/org.eclipse.jgit.ssh.apache.test/build.properties index 35d7145160..0e94aa00ef 100644 --- a/org.eclipse.jgit.ssh.apache.test/build.properties +++ b/org.eclipse.jgit.ssh.apache.test/build.properties @@ -3,4 +3,4 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ plugin.properties -additional.bundles = org.slf4j.binding.simple +additional.bundles = slf4j.simple diff --git a/org.eclipse.jgit.test/build.properties b/org.eclipse.jgit.test/build.properties index 212c8bd4d7..9e4c987066 100644 --- a/org.eclipse.jgit.test/build.properties +++ b/org.eclipse.jgit.test/build.properties @@ -7,4 +7,4 @@ bin.includes = META-INF/,\ plugin.properties,\ bin-tst/,\ bin/ -additional.bundles = org.slf4j.binding.simple +additional.bundles = slf4j.simple @@ -166,7 +166,7 @@ <japicmp-version>0.17.1</japicmp-version> <httpclient-version>4.5.14</httpclient-version> <httpcore-version>4.4.16</httpcore-version> - <slf4j-version>1.7.30</slf4j-version> + <slf4j-version>1.7.36</slf4j-version> <maven-javadoc-plugin-version>3.4.1</maven-javadoc-plugin-version> <gson-version>2.10.1</gson-version> <bouncycastle-version>1.73</bouncycastle-version> |