From: Matthias Sohn Date: Sat, 4 Dec 2021 00:58:53 +0000 (+0100) Subject: Merge branch 'stable-5.2' into stable-5.3 X-Git-Tag: v6.1.0.202202221755-m3~80^2^2^2^2^2^2^2^2~1^2~1^2~1^2^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc41de0e3cddf816ebaf0fe2e78a8b4cbe40bf5a;p=jgit.git Merge branch 'stable-5.2' into stable-5.3 * stable-5.2: Remove unused import in ApacheSshTest Update maven plugins Ignore missing javadoc in test bundles storage: file: De-duplicate File.exists()+File.isFile() RefDirectory.scanRef: Re-use file existence check done in snapshot creation FileSnapshot: Lazy load file store attributes cache Update eclipse-jarsigner-plugin to 1.3.2 Fix p2 repository URLs Change-Id: Id989365446cb55b9188e02e6e1f8cbc8ab71071c --- dc41de0e3cddf816ebaf0fe2e78a8b4cbe40bf5a diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index 86653bef02,268fbc7575..8176f0c827 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - ++ @@@ -86,7 -80,7 +86,7 @@@ -- ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd index 6beb42e33a,71230d705e..fad2e92005 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd @@@ -1,8 -1,8 +1,9 @@@ -target "jgit-4.9-staging" with source configurePhase +target "jgit-4.10" with source configurePhase -include "projects/jetty-9.4.11.tpd" +include "projects/jetty-9.4.14.tpd" include "orbit/R20190602212107-2019-06.tpd" --location "http://download.eclipse.org/releases/2018-12/" { ++location "https://download.eclipse.org/releases/2018-12/" { org.eclipse.osgi lazy -} +} ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target index 0000000000,0000000000..414e02cefb new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target @@@ -1,0 -1,0 +1,92 @@@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd index 0000000000,0000000000..0864e7647f new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.tpd @@@ -1,0 -1,0 +1,8 @@@ ++target "jgit-4.11" with source configurePhase ++ ++include "projects/jetty-9.4.14.tpd" ++include "orbit/R20190602212107-2019-06.tpd" ++ ++location "https://download.eclipse.org/releases/2019-03/" { ++ org.eclipse.osgi lazy ++} diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 05488b9c3d,bc1c54f52e..1a9608e611 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - ++ @@@ -86,7 -80,7 +86,7 @@@ -- ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd index 1a2c9a3a16,8b3dd0b476..a43593f29b --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd @@@ -1,8 -1,8 +1,8 @@@ target "jgit-4.6" with source configurePhase -include "projects/jetty-9.4.11.tpd" +include "projects/jetty-9.4.14.tpd" include "orbit/R20190602212107-2019-06.tpd" --location "http://download.eclipse.org/releases/neon/" { ++location "https://download.eclipse.org/releases/neon/" { org.eclipse.osgi lazy } diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index e82222a0c5,596e3c4d04..4d8e451f58 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - ++ @@@ -86,7 -80,7 +86,7 @@@ -- ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd index fc1b046edd,e93fc46b59..32835cabbf --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd @@@ -1,8 -1,8 +1,8 @@@ target "jgit-4.7" with source configurePhase -include "projects/jetty-9.4.11.tpd" +include "projects/jetty-9.4.14.tpd" include "orbit/R20190602212107-2019-06.tpd" --location "http://download.eclipse.org/releases/oxygen/" { ++location "https://download.eclipse.org/releases/oxygen/" { org.eclipse.osgi lazy } diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index 0b353db260,a0e0948600..491ff48c1e --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - ++ @@@ -86,7 -80,7 +86,7 @@@ -- ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd index a8f837e9ca,ba6337dbf9..c11bc62fc2 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd @@@ -1,8 -1,8 +1,8 @@@ target "jgit-4.8" with source configurePhase -include "projects/jetty-9.4.11.tpd" +include "projects/jetty-9.4.14.tpd" include "orbit/R20190602212107-2019-06.tpd" --location "http://download.eclipse.org/releases/photon/" { ++location "https://download.eclipse.org/releases/photon/" { org.eclipse.osgi lazy } diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index 94a752c74c,a4dd92c88c..d326705679 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd index f91f53eb8b,6ee4c6a848..a2658b4382 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd @@@ -1,8 -1,8 +1,8 @@@ target "jgit-4.9" with source configurePhase -include "projects/jetty-9.4.11.tpd" +include "projects/jetty-9.4.14.tpd" include "orbit/R20190602212107-2019-06.tpd" - location "http://download.eclipse.org/releases/2018-09/" { + location "https://download.eclipse.org/releases/2018-09/" { org.eclipse.osgi lazy } diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd index 5372e77e5a,0000000000..fb0963ef73 mode 100644,000000..100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.14.tpd @@@ -1,20 -1,0 +1,20 @@@ +target "jetty-9.4.14" with source configurePhase + - location jetty-9.4.14 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181114" { ++location jetty-9.4.14 "https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.14.v20181114" { + org.eclipse.jetty.client [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.client.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.continuation [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.continuation.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.http [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.http.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.io [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.io.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.security [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.security.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.server [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.server.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.servlet [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.servlet.source [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.util [9.4.14.v20181114,9.4.14.v20181114] + org.eclipse.jetty.util.source [9.4.14.v20181114,9.4.14.v20181114] +} diff --cc pom.xml index d4032fa440,df604a6ed1..d5c3a78424 --- a/pom.xml +++ b/pom.xml @@@ -199,15 -199,13 +199,14 @@@ 4.4.10 1.7.2 1.2.15 - 3.1.0 - 1.3.0 + 3.3.1 + 1.7.0 2.8.2 + 1.60 - 3.1.11 - 3.0.0 - 3.0.0 - 3.1.12 - 3.0.0-M3 + 3.1.2 + 3.1.1 + 4.3.0 + 3.0.0-M5 ${maven-surefire-plugin-version} 3.8.1 @@@ -415,13 -412,8 +414,13 @@@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 + 3.2.0 + + org.springframework.boot + spring-boot-maven-plugin + 2.1.2.RELEASE +