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'
This commit is contained in:
commit
df4fa808b3
|
@ -277,7 +277,6 @@ java_library(
|
|||
|
||||
java_library(
|
||||
name = "slf4j-simple",
|
||||
testonly = 1,
|
||||
visibility = ["//visibility:public"],
|
||||
exports = ["@slf4j-simple//jar"],
|
||||
)
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.10.12</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
@ -4,5 +4,4 @@ output.. = bin/
|
|||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
plugin.properties
|
||||
additional.bundles = org.apache.log4j,\
|
||||
org.slf4j.binding.log4j12
|
||||
additional.bundles = org.slf4j.binding.simple
|
||||
|
|
|
@ -165,12 +165,6 @@
|
|||
<bundle id="org.apache.httpcomponents.httpcore.source">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
<bundle id="org.apache.log4j">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
<bundle id="org.apache.log4j.source">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
<bundle id="org.apache.sshd.osgi">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
|
@ -219,10 +213,10 @@
|
|||
<bundle id="org.slf4j.api.source">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
<bundle id="org.slf4j.binding.log4j12">
|
||||
<bundle id="org.slf4j.binding.simple">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
<bundle id="org.slf4j.binding.log4j12.source">
|
||||
<bundle id="org.slf4j.binding.simple.source">
|
||||
<category name="JGit-dependency-bundles"/>
|
||||
</bundle>
|
||||
<bundle id="org.tukaani.xz">
|
||||
|
|
|
@ -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="1638648728">
|
||||
<target name="jgit-4.17" sequenceNumber="1641393954">
|
||||
<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"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.17" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211122181901-2021-12.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.18" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211122181901-2021-12.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2020-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
@ -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="1638648728">
|
||||
<target name="jgit-4.19-staging" sequenceNumber="1641394141">
|
||||
<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"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.19-staging" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211122181901-2021-12.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
|
||||
location "https://download.eclipse.org/staging/2021-03/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
@ -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="1638648728">
|
||||
<target name="jgit-4.20" sequenceNumber="1641394152">
|
||||
<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"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.20" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211122181901-2021-12.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-06/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
@ -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="1638648728">
|
||||
<target name="jgit-4.21" sequenceNumber="1641394170">
|
||||
<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"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.21" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211122181901-2021-12.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-09/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
@ -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="1638648736">
|
||||
<target name="jgit-4.22" sequenceNumber="1641394177">
|
||||
<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"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
target "jgit-4.22" with source configurePhase
|
||||
|
||||
include "projects/jetty-10.0.x.tpd"
|
||||
include "orbit/R20211122181901-2021-12.tpd"
|
||||
include "orbit/R20211213173813-2021-12.tpd"
|
||||
|
||||
location "https://download.eclipse.org/releases/2021-12/" {
|
||||
org.eclipse.osgi lazy
|
||||
|
|
|
@ -0,0 +1,69 @@
|
|||
target "R20211213173813-2021-12" with source configurePhase
|
||||
// see https://download.eclipse.org/tools/orbit/downloads/
|
||||
|
||||
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository" {
|
||||
com.google.gson [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
|
||||
com.google.gson.source [2.8.8.v20211029-0838,2.8.8.v20211029-0838]
|
||||
com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
||||
com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902]
|
||||
com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305]
|
||||
com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305]
|
||||
com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343]
|
||||
com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343]
|
||||
com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
|
||||
com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004]
|
||||
javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
|
||||
javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839]
|
||||
net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
|
||||
net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
|
||||
net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534]
|
||||
net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
|
||||
net.i2p.crypto.eddsa [0.3.0.v20210923-1401,0.3.0.v20210923-1401]
|
||||
net.i2p.crypto.eddsa.source [0.3.0.v20210923-1401,0.3.0.v20210923-1401]
|
||||
org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
|
||||
org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452]
|
||||
org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
|
||||
org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422]
|
||||
org.apache.commons.compress [1.21.0.v20211103-2100,1.21.0.v20211103-2100]
|
||||
org.apache.commons.compress.source [1.21.0.v20211103-2100,1.21.0.v20211103-2100]
|
||||
org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
|
||||
org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502]
|
||||
org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
|
||||
org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225]
|
||||
org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
|
||||
org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225]
|
||||
org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618]
|
||||
org.assertj [3.20.2.v20210706-1104,3.20.2.v20210706-1104]
|
||||
org.assertj.source [3.20.2.v20210706-1104,3.20.2.v20210706-1104]
|
||||
org.bouncycastle.bcpg [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcprov [1.69.0.v20210923-1401,1.69.0.v20210923-1401]
|
||||
org.bouncycastle.bcprov.source [1.69.0.v20210923-1401,1.69.0.v20210923-1401]
|
||||
org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924]
|
||||
org.hamcrest [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
|
||||
org.hamcrest.source [2.2.0.v20210711-0821,2.2.0.v20210711-0821]
|
||||
org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
|
||||
org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
|
||||
org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
|
||||
org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
|
||||
org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956]
|
||||
org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956]
|
||||
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
|
||||
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
|
||||
org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
|
||||
org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642]
|
||||
org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
|
||||
org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519]
|
||||
org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.binding.simple [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
org.slf4j.binding.simple.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150]
|
||||
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]
|
||||
}
|
|
@ -6,4 +6,4 @@ bin.includes = META-INF/,\
|
|||
.,\
|
||||
plugin.properties,\
|
||||
about.html,\
|
||||
resources/log4j.properties
|
||||
resources/simplelogger.properties
|
||||
|
|
|
@ -103,12 +103,7 @@
|
|||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
log4j.rootLogger=WARN, stderr
|
||||
|
||||
log4j.appender.stderr=org.apache.log4j.ConsoleAppender
|
||||
log4j.appender.stderr.Target=System.err
|
||||
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.stderr.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
|
|
@ -0,0 +1,6 @@
|
|||
org.slf4j.simpleLogger.defaultLogLevel=warn
|
||||
org.slf4j.simpleLogger.logFile=System.err
|
||||
org.slf4j.simpleLogger.showDateTime=true
|
||||
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss
|
||||
org.slf4j.simpleLogger.showThreadName=true
|
||||
org.slf4j.simpleLogger.showLogName=true
|
|
@ -132,7 +132,6 @@
|
|||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- New in 6.0; uncomment in 6.1
|
||||
<plugin>
|
||||
<groupId>com.github.siom79.japicmp</groupId>
|
||||
<artifactId>japicmp-maven-plugin</artifactId>
|
||||
|
@ -155,6 +154,9 @@
|
|||
<includes>
|
||||
<include>org.eclipse.jgit.*</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>*.internal.*</exclude>
|
||||
</excludes>
|
||||
<accessModifier>public</accessModifier>
|
||||
<breakBuildOnModifications>false</breakBuildOnModifications>
|
||||
<breakBuildOnBinaryIncompatibleModifications>false</breakBuildOnBinaryIncompatibleModifications>
|
||||
|
@ -174,11 +176,9 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
-->
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<!-- New in 6.0, uncomment in 6.1
|
||||
<reporting>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
@ -210,6 +210,9 @@
|
|||
<includes>
|
||||
<include>org.eclipse.jgit.*</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>*.internal.*</exclude>
|
||||
</excludes>
|
||||
<accessModifier>public</accessModifier>
|
||||
<breakBuildOnModifications>false</breakBuildOnModifications>
|
||||
<breakBuildOnBinaryIncompatibleModifications>false</breakBuildOnBinaryIncompatibleModifications>
|
||||
|
@ -223,5 +226,4 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</reporting>
|
||||
-->
|
||||
</project>
|
||||
|
|
|
@ -3,5 +3,4 @@ output.. = bin/
|
|||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
plugin.properties
|
||||
additional.bundles = org.apache.log4j,\
|
||||
org.slf4j.binding.log4j12
|
||||
additional.bundles = org.slf4j.binding.simple
|
||||
|
|
|
@ -107,6 +107,32 @@ public void testEd25519HostKey() throws Exception {
|
|||
"IdentityFile " + privateKey1.getAbsolutePath());
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for SSHD-1231. If authentication is attempted first with an RSA key,
|
||||
* which is rejected, and then with some other key type (here ed25519),
|
||||
* authentication fails in bug SSHD-1231.
|
||||
*
|
||||
* @throws Exception
|
||||
* on errors
|
||||
* @see <a href=
|
||||
* "https://issues.apache.org/jira/browse/SSHD-1231">SSHD-1231</a>
|
||||
*/
|
||||
@Test
|
||||
public void testWrongKeyFirst() throws Exception {
|
||||
File userKey = new File(getTemporaryDirectory(), "userkey");
|
||||
copyTestResource("id_ed25519", userKey);
|
||||
File publicKey = new File(getTemporaryDirectory(), "userkey.pub");
|
||||
copyTestResource("id_ed25519.pub", publicKey);
|
||||
server.setTestUserPublicKey(publicKey.toPath());
|
||||
cloneWith("ssh://git/doesntmatter", defaultCloneDir, null, //
|
||||
"Host git", //
|
||||
"HostName localhost", //
|
||||
"Port " + testPort, //
|
||||
"User " + TEST_USER, //
|
||||
"IdentityFile " + privateKey1.getAbsolutePath(), // RSA
|
||||
"IdentityFile " + userKey.getAbsolutePath());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testHashedKnownHosts() throws Exception {
|
||||
assertTrue("Failed to delete known_hosts", knownHosts.delete());
|
||||
|
|
|
@ -154,6 +154,9 @@
|
|||
<includes>
|
||||
<include>org.eclipse.jgit.*</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>*.internal.*</exclude>
|
||||
</excludes>
|
||||
<accessModifier>public</accessModifier>
|
||||
<breakBuildOnModifications>false</breakBuildOnModifications>
|
||||
<breakBuildOnBinaryIncompatibleModifications>false</breakBuildOnBinaryIncompatibleModifications>
|
||||
|
@ -207,6 +210,9 @@
|
|||
<includes>
|
||||
<include>org.eclipse.jgit.*</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>*.internal.*</exclude>
|
||||
</excludes>
|
||||
<accessModifier>public</accessModifier>
|
||||
<breakBuildOnModifications>false</breakBuildOnModifications>
|
||||
<breakBuildOnBinaryIncompatibleModifications>false</breakBuildOnBinaryIncompatibleModifications>
|
||||
|
|
|
@ -108,4 +108,18 @@ public PublicKeyIdentity next() {
|
|||
};
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected PublicKeyIdentity resolveAttemptedPublicKeyIdentity(
|
||||
ClientSession session, String service) throws Exception {
|
||||
PublicKeyIdentity result = super.resolveAttemptedPublicKeyIdentity(
|
||||
session, service);
|
||||
// This fixes SSHD-1231. Can be removed once we're using Apache MINA
|
||||
// sshd > 2.8.0.
|
||||
//
|
||||
// See https://issues.apache.org/jira/browse/SSHD-1231
|
||||
currentAlgorithms.clear();
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -7,5 +7,4 @@ bin.includes = META-INF/,\
|
|||
plugin.properties,\
|
||||
bin-tst/,\
|
||||
bin/
|
||||
additional.bundles = org.apache.log4j,\
|
||||
org.slf4j.binding.log4j12
|
||||
additional.bundles = org.slf4j.binding.simple
|
||||
|
|
|
@ -36,7 +36,7 @@ def tests(tests):
|
|||
]
|
||||
if src.endswith("SecurityManagerMissingPermissionsTest.java"):
|
||||
additional_deps = [
|
||||
"//lib:log4j",
|
||||
"//lib:slf4j-simple",
|
||||
]
|
||||
if src.endswith("JDKHttpConnectionTest.java"):
|
||||
additional_deps = [
|
||||
|
@ -68,6 +68,7 @@ def tests(tests):
|
|||
"//lib:javaewah",
|
||||
"//lib:junit",
|
||||
"//lib:slf4j-api",
|
||||
"//lib:slf4j-simple",
|
||||
"//org.eclipse.jgit:jgit",
|
||||
"//org.eclipse.jgit.junit:junit",
|
||||
"//org.eclipse.jgit.lfs:jgit-lfs",
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
|
||||
# Root logger option
|
||||
log4j.rootLogger=INFO, stdout
|
||||
|
||||
# Direct log messages to stdout
|
||||
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
|
||||
log4j.appender.stdout.Target=System.out
|
||||
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
|
||||
log4j.appender.fileLogger.bufferedIO = true
|
||||
log4j.appender.fileLogger.bufferSize = 4096
|
||||
|
||||
#log4j.logger.org.eclipse.jgit.util.FS = DEBUG
|
||||
#log4j.logger.org.eclipse.jgit.internal.storage.file.FileSnapshot = DEBUG
|
|
@ -1,9 +1,9 @@
|
|||
org.slf4j.simpleLogger.logFile = System.err
|
||||
org.slf4j.simpleLogger.cacheOutputStream = true
|
||||
org.slf4j.simpleLogger.defaultLogLevel = info
|
||||
org.slf4j.simpleLogger.showDateTime = true
|
||||
org.slf4j.simpleLogger.dateTimeFormat = HH:mm:ss.SSSXXX
|
||||
org.slf4j.simpleLogger.showThreadName = true
|
||||
org.slf4j.simpleLogger.defaultLogLevel=info
|
||||
org.slf4j.simpleLogger.logFile=System.err
|
||||
org.slf4j.simpleLogger.showDateTime=true
|
||||
org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss
|
||||
org.slf4j.simpleLogger.showThreadName=true
|
||||
org.slf4j.simpleLogger.showLogName=true
|
||||
|
||||
#org.slf4j.simpleLogger.log.org.eclipse.jgit.util.FS = debug
|
||||
#org.slf4j.simpleLogger.log.org.eclipse.jgit.internal.storage.file.FileSnapshot = debug
|
||||
|
|
|
@ -13,17 +13,15 @@
|
|||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.StringWriter;
|
||||
import java.io.PrintStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.security.Policy;
|
||||
import java.util.Collections;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.log4j.PatternLayout;
|
||||
import org.apache.log4j.WriterAppender;
|
||||
import org.eclipse.jgit.junit.RepositoryTestCase;
|
||||
import org.eclipse.jgit.util.FileUtils;
|
||||
import org.junit.After;
|
||||
|
@ -38,25 +36,21 @@ public class SecurityManagerMissingPermissionsTest extends RepositoryTestCase {
|
|||
/**
|
||||
* Collects all logging sent to the logging system.
|
||||
*/
|
||||
private final StringWriter errorOutputWriter = new StringWriter();
|
||||
|
||||
/**
|
||||
* Appender to intercept all logging sent to the logging system.
|
||||
*/
|
||||
private WriterAppender appender;
|
||||
private final ByteArrayOutputStream errorOutput = new ByteArrayOutputStream();
|
||||
|
||||
private SecurityManager originalSecurityManager;
|
||||
|
||||
private PrintStream defaultErrorOutput;
|
||||
|
||||
@Override
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
originalSecurityManager = System.getSecurityManager();
|
||||
|
||||
appender = new WriterAppender(
|
||||
new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN),
|
||||
errorOutputWriter);
|
||||
|
||||
Logger.getRootLogger().addAppender(appender);
|
||||
// slf4j-simple logs to System.err, redirect it to enable asserting
|
||||
// logged errors
|
||||
defaultErrorOutput = System.err;
|
||||
System.setErr(new PrintStream(errorOutput));
|
||||
|
||||
refreshPolicyAllPermission(Policy.getPolicy());
|
||||
System.setSecurityManager(new SecurityManager());
|
||||
|
@ -85,14 +79,14 @@ public void testCreateNewRepos_MissingPermissions() throws Exception {
|
|||
|
||||
addRepoToClose(git.getRepository());
|
||||
|
||||
assertEquals("", errorOutputWriter.toString());
|
||||
assertEquals("", errorOutput.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
System.setSecurityManager(originalSecurityManager);
|
||||
Logger.getRootLogger().removeAppender(appender);
|
||||
System.setErr(defaultErrorOutput);
|
||||
super.tearDown();
|
||||
}
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@
|
|||
public class WalkEncryptionTest {
|
||||
|
||||
/**
|
||||
* Logger setup: ${project_loc}/tst-rsrc/log4j.properties
|
||||
* Logger setup: ${project_loc}/tst-rsrc/simplelogger.properties
|
||||
*/
|
||||
static final Logger logger = LoggerFactory.getLogger(WalkEncryptionTest.class);
|
||||
|
||||
|
|
29
pom.xml
29
pom.xml
|
@ -150,7 +150,7 @@
|
|||
<java.version>11</java.version>
|
||||
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
|
||||
|
||||
<jgit-last-release-version>5.13.0.202109080827-r</jgit-last-release-version>
|
||||
<jgit-last-release-version>6.0.0.202111291000-r</jgit-last-release-version>
|
||||
<ant-version>1.10.12</ant-version>
|
||||
<apache-sshd-version>2.7.0</apache-sshd-version>
|
||||
<jsch-version>0.1.55</jsch-version>
|
||||
|
@ -167,7 +167,6 @@
|
|||
<httpclient-version>4.5.13</httpclient-version>
|
||||
<httpcore-version>4.4.14</httpcore-version>
|
||||
<slf4j-version>1.7.30</slf4j-version>
|
||||
<log4j-version>1.2.15</log4j-version>
|
||||
<maven-javadoc-plugin-version>3.3.1</maven-javadoc-plugin-version>
|
||||
<tycho-extras-version>2.5.0</tycho-extras-version>
|
||||
<gson-version>2.8.8</gson-version>
|
||||
|
@ -722,34 +721,10 @@
|
|||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>${slf4j-version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>${log4j-version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>javax.mail</groupId>
|
||||
<artifactId>mail</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>javax.jms</groupId>
|
||||
<artifactId>jms</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jdmk</groupId>
|
||||
<artifactId>jmxtools</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>com.sun.jmx</groupId>
|
||||
<artifactId>jmxri</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.code.gson</groupId>
|
||||
<artifactId>gson</artifactId>
|
||||
|
|
Loading…
Reference in New Issue