diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2022-01-06 14:05:00 -0500 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2022-01-06 14:05:00 -0500 |
| commit | df4fa808b3a872fda33418a931dcaf3ab8699f10 (patch) | |
| tree | 1d37a7628c9e416cf62a8eb64330e021f8e2ac08 /org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | |
| parent | e4f6e0af4ac3f83418e98bbfeccb94493c870b83 (diff) | |
| parent | 4c555f0742856bb21efcb2df53c7ceac921ffe80 (diff) | |
| download | jgit-df4fa808b3a872fda33418a931dcaf3ab8699f10.tar.gz jgit-df4fa808b3a872fda33418a931dcaf3ab8699f10.zip | |
Merge changes Ia744cd4a,Id95350c7,I746b7fb7
* changes:
sshd: backport upstream fix for SSHD-1231
[releng] bump japicmp base version and configure sshd bundles
Merge branch 'stable-6.0'
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target')
| -rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 10 |
1 files changed, 4 insertions, 6 deletions
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 cbe26bbf16..28204f5384 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="1638648728"> +<target name="jgit-4.18" sequenceNumber="1641394122"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="jakarta.servlet-api" version="4.0.0"/> @@ -53,8 +53,6 @@ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/> <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.14.v20210128-2225"/> - <unit id="org.apache.log4j" version="1.2.15.v201012070815"/> - <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> <unit id="org.apache.sshd.osgi" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.osgi.source" version="2.7.0.v20210623-0618"/> <unit id="org.apache.sshd.sftp" version="2.7.0.v20210623-0618"/> @@ -85,11 +83,11 @@ <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.log4j12" version="1.7.30.v20201108-2042"/> - <unit id="org.slf4j.binding.log4j12.source" version="1.7.30.v20201108-2042"/> + <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> + <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> <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/R20211122181901/repository"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> |