From: Matthias Sohn Date: Sat, 4 Dec 2021 01:16:08 +0000 (+0100) Subject: Merge branch 'stable-5.3' into stable-5.4 X-Git-Tag: v6.1.0.202202221755-m3~80^2^2^2^2^2^2^2^2~1^2~1^2~1^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F188527%2F1;p=jgit.git Merge branch 'stable-5.3' into stable-5.4 * stable-5.3: 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: I0e80612c8ddb934466105312f9107e91d581de0b --- 7ae2ee300a37a8f1515df3b989a293827702f169 diff --cc org.eclipse.jgit.junit/.settings/.api_filters index 0000000000,0000000000..05665a3d15 new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.junit/.settings/.api_filters @@@ -1,0 -1,0 +1,11 @@@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index 36660ff3e6,8176f0c827..941d4961d7 --- 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,7 -1,7 +1,7 @@@ - - ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target index afa4b3da2c,414e02cefb..4be2f466d2 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.11.target @@@ -1,7 -1,7 +1,7 @@@ - - ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target index 0000000000,0000000000..34ffd455a6 new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.target @@@ -1,0 -1,0 +1,92 @@@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd index 0000000000,0000000000..cff602607a new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.12.tpd @@@ -1,0 -1,0 +1,8 @@@ ++target "jgit-4.12" with source configurePhase ++ ++include "projects/jetty-9.4.14.tpd" ++include "orbit/R20190602212107-2019-06.tpd" ++ ++location "https://download.eclipse.org/releases/2019-06/" { ++ org.eclipse.osgi lazy ++} diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 9724939f8a,1a9608e611..489b01c58a --- 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,7 -1,7 +1,7 @@@ - - ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 6bd70e0160,4d8e451f58..627a83a755 --- 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,7 -1,7 +1,7 @@@ - - ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index e33ece710a,491ff48c1e..dc45c7d16e --- 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,7 -1,7 +1,7 @@@ - - ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index 9b3fe1b930,d326705679..040c1d1274 --- 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,7 -1,7 +1,7 @@@ - - ++ diff --cc pom.xml index 7c47ca4ed0,d5c3a78424..26b1c1ae8a --- a/pom.xml +++ b/pom.xml @@@ -199,15 -199,14 +199,14 @@@ 4.4.10

1.7.2

1.2.15 - 3.1.0 - 1.4.0 + 3.3.1 + 1.7.0 2.8.2 - 1.60 + 1.61 - 3.1.12 - 3.0.0 - 3.0.0 - 3.1.12 - 3.0.0-M3 + 3.1.2 - 3.1.1 ++ 3.0.0-M5 + 4.3.0 + 3.0.0-M5

${maven-surefire-plugin-version}

3.8.1